miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 b48af48187d502056773ea8d629de1d513a2664e 1 个父辈 86a6a94b

对接本周实验，往期实验，登录接口

内嵌 并排对比
正在显示 10 个修改的文件 包含 353 行增加 和 136 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="modal 模板"> 4 + <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="上传到远程wumengyu">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxml" afterDir="false" />
  12 + <change beforePath="$PROJECT_DIR$/pages/start/start.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.js" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
  14 + <change beforePath="$PROJECT_DIR$/templates/templates.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxml" afterDir="false" />
7 </list> 15 </list>
8 <ignored path="$PROJECT_DIR$/.tmp/" /> 16 <ignored path="$PROJECT_DIR$/.tmp/" />
9 <ignored path="$PROJECT_DIR$/temp/" /> 17 <ignored path="$PROJECT_DIR$/temp/" />
@@ -18,40 +26,44 @@ @@ -18,40 +26,44 @@
18 <session id="-381596063"> 26 <session id="-381596063">
19 <usages-collector id="statistics.lifecycle.project"> 27 <usages-collector id="statistics.lifecycle.project">
20 <counts> 28 <counts>
  29 + <entry key="project.closed" value="3" />
  30 + <entry key="project.open.time.0" value="3" />
21 <entry key="project.open.time.1" value="1" /> 31 <entry key="project.open.time.1" value="1" />
22 - <entry key="project.opened" value="1" /> 32 + <entry key="project.opened" value="4" />
23 </counts> 33 </counts>
24 </usages-collector> 34 </usages-collector>
25 <usages-collector id="statistics.file.extensions.open"> 35 <usages-collector id="statistics.file.extensions.open">
26 <counts> 36 <counts>
27 - <entry key="js" value="1" />  
28 - <entry key="json" value="1" />  
29 - <entry key="wxml" value="3" />  
30 - <entry key="wxss" value="3" /> 37 + <entry key="js" value="6" />
  38 + <entry key="json" value="4" />
  39 + <entry key="wxml" value="9" />
  40 + <entry key="wxss" value="5" />
31 </counts> 41 </counts>
32 </usages-collector> 42 </usages-collector>
33 <usages-collector id="statistics.file.types.open"> 43 <usages-collector id="statistics.file.types.open">
34 <counts> 44 <counts>
35 - <entry key="CSS" value="3" />  
36 - <entry key="HTML" value="3" />  
37 - <entry key="JSON" value="1" />  
38 - <entry key="JavaScript" value="1" /> 45 + <entry key="CSS" value="5" />
  46 + <entry key="HTML" value="9" />
  47 + <entry key="JSON" value="4" />
  48 + <entry key="JavaScript" value="6" />
39 </counts> 49 </counts>
40 </usages-collector> 50 </usages-collector>
41 <usages-collector id="statistics.file.extensions.edit"> 51 <usages-collector id="statistics.file.extensions.edit">
42 <counts> 52 <counts>
43 - <entry key="js" value="56" />  
44 - <entry key="txt" value="18" />  
45 - <entry key="wxml" value="108" /> 53 + <entry key="js" value="564" />
  54 + <entry key="json" value="27" />
  55 + <entry key="txt" value="36" />
  56 + <entry key="wxml" value="244" />
46 <entry key="wxss" value="21" /> 57 <entry key="wxss" value="21" />
47 </counts> 58 </counts>
48 </usages-collector> 59 </usages-collector>
49 <usages-collector id="statistics.file.types.edit"> 60 <usages-collector id="statistics.file.types.edit">
50 <counts> 61 <counts>
51 <entry key="CSS" value="21" /> 62 <entry key="CSS" value="21" />
52 - <entry key="HTML" value="108" />  
53 - <entry key="JavaScript" value="56" />  
54 - <entry key="PLAIN_TEXT" value="18" /> 63 + <entry key="HTML" value="244" />
  64 + <entry key="JSON" value="27" />
  65 + <entry key="JavaScript" value="564" />
  66 + <entry key="PLAIN_TEXT" value="36" />
55 </counts> 67 </counts>
56 </usages-collector> 68 </usages-collector>
57 </session> 69 </session>
@@ -61,8 +73,8 @@ @@ -61,8 +73,8 @@
61 <file pinned="false" current-in-tab="false"> 73 <file pinned="false" current-in-tab="false">
62 <entry file="file://$PROJECT_DIR$/pages/index/index.wxml"> 74 <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
63 <provider selected="true" editor-type-id="text-editor"> 75 <provider selected="true" editor-type-id="text-editor">
64 - <state relative-caret-position="608">  
65 - <caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" /> 76 + <state relative-caret-position="880">
  77 + <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
66 </state> 78 </state>
67 </provider> 79 </provider>
68 </entry> 80 </entry>
@@ -70,17 +82,26 @@ @@ -70,17 +82,26 @@
70 <file pinned="false" current-in-tab="false"> 82 <file pinned="false" current-in-tab="false">
71 <entry file="file://$PROJECT_DIR$/pages/index/index.wxss"> 83 <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
72 <provider selected="true" editor-type-id="text-editor"> 84 <provider selected="true" editor-type-id="text-editor">
73 - <state relative-caret-position="22">  
74 - <caret line="1" selection-start-line="1" selection-end-line="2" /> 85 + <state relative-caret-position="154">
  86 + <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
75 </state> 87 </state>
76 </provider> 88 </provider>
77 </entry> 89 </entry>
78 </file> 90 </file>
79 <file pinned="false" current-in-tab="false"> 91 <file pinned="false" current-in-tab="false">
80 - <entry file="file://$PROJECT_DIR$/project.config.json"> 92 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
81 <provider selected="true" editor-type-id="text-editor"> 93 <provider selected="true" editor-type-id="text-editor">
82 - <state relative-caret-position="352">  
83 - <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" /> 94 + <state relative-caret-position="506">
  95 + <caret line="98" column="64" selection-start-line="98" selection-start-column="64" selection-end-line="98" selection-end-column="64" />
  96 + <folding>
  97 + <element signature="n#!!doc" expanded="true" />
  98 + <element signature="e#1018#1103#0" />
  99 + <element signature="e#1121#1191#0" />
  100 + <element signature="e#1219#1288#0" />
  101 + <element signature="e#1321#1468#0" />
  102 + <element signature="e#1499#1619#0" />
  103 + <element signature="e#1750#1766#0" />
  104 + </folding>
84 </state> 105 </state>
85 </provider> 106 </provider>
86 </entry> 107 </entry>
@@ -88,56 +109,60 @@ @@ -88,56 +109,60 @@
88 <file pinned="false" current-in-tab="false"> 109 <file pinned="false" current-in-tab="false">
89 <entry file="file://$PROJECT_DIR$/templates/templates.wxml"> 110 <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
90 <provider selected="true" editor-type-id="text-editor"> 111 <provider selected="true" editor-type-id="text-editor">
91 - <state relative-caret-position="718">  
92 - <caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" /> 112 + <state relative-caret-position="374">
  113 + <caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
93 </state> 114 </state>
94 </provider> 115 </provider>
95 </entry> 116 </entry>
96 </file> 117 </file>
97 - <file pinned="false" current-in-tab="false">  
98 - <entry file="file://$PROJECT_DIR$/templates/templates.wxss"> 118 + <file pinned="false" current-in-tab="true">
  119 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
99 <provider selected="true" editor-type-id="text-editor"> 120 <provider selected="true" editor-type-id="text-editor">
100 - <state>  
101 - <caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" /> 121 + <state relative-caret-position="198">
  122 + <caret line="9" column="35" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
102 </state> 123 </state>
103 </provider> 124 </provider>
104 </entry> 125 </entry>
105 </file> 126 </file>
106 <file pinned="false" current-in-tab="false"> 127 <file pinned="false" current-in-tab="false">
107 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss"> 128 + <entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
108 <provider selected="true" editor-type-id="text-editor"> 129 <provider selected="true" editor-type-id="text-editor">
109 - <state relative-caret-position="462">  
110 - <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" /> 130 + <state relative-caret-position="132">
  131 + <caret line="6" column="15" lean-forward="true" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
111 </state> 132 </state>
112 </provider> 133 </provider>
113 </entry> 134 </entry>
114 </file> 135 </file>
115 - <file pinned="false" current-in-tab="true">  
116 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">  
117 - <provider selected="true" editor-type-id="text-editor">  
118 - <state relative-caret-position="370">  
119 - <caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" />  
120 - </state>  
121 - </provider> 136 + <file pinned="false" current-in-tab="false">
  137 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.json">
  138 + <provider selected="true" editor-type-id="text-editor" />
122 </entry> 139 </entry>
123 </file> 140 </file>
124 <file pinned="false" current-in-tab="false"> 141 <file pinned="false" current-in-tab="false">
125 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js"> 142 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
126 <provider selected="true" editor-type-id="text-editor"> 143 <provider selected="true" editor-type-id="text-editor">
127 - <state relative-caret-position="462">  
128 - <caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" /> 144 + <state relative-caret-position="550">
  145 + <caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
129 </state> 146 </state>
130 </provider> 147 </provider>
131 </entry> 148 </entry>
132 </file> 149 </file>
133 <file pinned="false" current-in-tab="false"> 150 <file pinned="false" current-in-tab="false">
134 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">  
135 - <provider selected="true" editor-type-id="text-editor" /> 151 + <entry file="file://$PROJECT_DIR$/pages/start/start.js">
  152 + <provider selected="true" editor-type-id="text-editor">
  153 + <state relative-caret-position="374">
  154 + <caret line="29" column="49" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="49" />
  155 + </state>
  156 + </provider>
136 </entry> 157 </entry>
137 </file> 158 </file>
138 <file pinned="false" current-in-tab="false"> 159 <file pinned="false" current-in-tab="false">
139 - <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">  
140 - <provider selected="true" editor-type-id="text-editor" /> 160 + <entry file="file://$PROJECT_DIR$/app.json">
  161 + <provider selected="true" editor-type-id="text-editor">
  162 + <state relative-caret-position="440">
  163 + <caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
  164 + </state>
  165 + </provider>
141 </entry> 166 </entry>
142 </file> 167 </file>
143 </leaf> 168 </leaf>
@@ -145,6 +170,8 @@ @@ -145,6 +170,8 @@
145 <component name="FindInProjectRecents"> 170 <component name="FindInProjectRecents">
146 <findStrings> 171 <findStrings>
147 <find>chooseYes</find> 172 <find>chooseYes</find>
  173 + <find>baseUrl</find>
  174 + <find>getUserInfo</find>
148 </findStrings> 175 </findStrings>
149 </component> 176 </component>
150 <component name="Git.Settings"> 177 <component name="Git.Settings">
@@ -153,11 +180,18 @@ @@ -153,11 +180,18 @@
153 <component name="IdeDocumentHistory"> 180 <component name="IdeDocumentHistory">
154 <option name="CHANGED_PATHS"> 181 <option name="CHANGED_PATHS">
155 <list> 182 <list>
156 - <option value="$PROJECT_DIR$/templates/templates.wxml" />  
157 <option value="$PROJECT_DIR$/templates/templates.wxss" /> 183 <option value="$PROJECT_DIR$/templates/templates.wxss" />
158 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" /> 184 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
159 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" /> 185 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
160 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" /> 186 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
  187 + <option value="$PROJECT_DIR$/app.js" />
  188 + <option value="$PROJECT_DIR$/pages/start/start.js" />
  189 + <option value="$PROJECT_DIR$/pages/index/index.wxml" />
  190 + <option value="$PROJECT_DIR$/templates/templates.wxml" />
  191 + <option value="$PROJECT_DIR$/pages/index/index.js" />
  192 + <option value="$PROJECT_DIR$/app.json" />
  193 + <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" />
  194 + <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
161 </list> 195 </list>
162 </option> 196 </option>
163 </component> 197 </component>
@@ -168,7 +202,8 @@ @@ -168,7 +202,8 @@
168 <sorting>DEFINITION_ORDER</sorting> 202 <sorting>DEFINITION_ORDER</sorting>
169 </component> 203 </component>
170 <component name="ProjectFrameBounds" extendedState="6"> 204 <component name="ProjectFrameBounds" extendedState="6">
171 - <option name="y" value="22" /> 205 + <option name="x" value="-3" />
  206 + <option name="y" value="1" />
172 <option name="width" value="1936" /> 207 <option name="width" value="1936" />
173 <option name="height" value="1047" /> 208 <option name="height" value="1047" />
174 </component> 209 </component>
@@ -177,6 +212,7 @@ @@ -177,6 +212,7 @@
177 <foldersAlwaysOnTop value="true" /> 212 <foldersAlwaysOnTop value="true" />
178 </navigator> 213 </navigator>
179 <panes> 214 <panes>
  215 + <pane id="Scope" />
180 <pane id="ProjectPane"> 216 <pane id="ProjectPane">
181 <subPane> 217 <subPane>
182 <expand> 218 <expand>
@@ -200,7 +236,20 @@ @@ -200,7 +236,20 @@
200 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 236 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
201 <item name="pages" type="462c0819:PsiDirectoryNode" /> 237 <item name="pages" type="462c0819:PsiDirectoryNode" />
202 <item name="index" type="462c0819:PsiDirectoryNode" /> 238 <item name="index" type="462c0819:PsiDirectoryNode" />
203 - <item name="confirm-appointment-info" type="462c0819:PsiDirectoryNode" /> 239 + <item name="activity-detail" type="462c0819:PsiDirectoryNode" />
  240 + </path>
  241 + <path>
  242 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  243 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  244 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  245 + <item name="index" type="462c0819:PsiDirectoryNode" />
  246 + <item name="phone-code" type="462c0819:PsiDirectoryNode" />
  247 + </path>
  248 + <path>
  249 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  250 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  251 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  252 + <item name="start" type="462c0819:PsiDirectoryNode" />
204 </path> 253 </path>
205 <path> 254 <path>
206 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 255 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
@@ -211,12 +260,11 @@ @@ -211,12 +260,11 @@
211 <select /> 260 <select />
212 </subPane> 261 </subPane>
213 </pane> 262 </pane>
214 - <pane id="Scope" />  
215 </panes> 263 </panes>
216 </component> 264 </component>
217 <component name="PropertiesComponent"> 265 <component name="PropertiesComponent">
218 <property name="WebServerToolWindowFactoryState" value="false" /> 266 <property name="WebServerToolWindowFactoryState" value="false" />
219 - <property name="last_opened_file_path" value="D:/公众号/福牌" /> 267 + <property name="last_opened_file_path" value="D:/project/life" />
220 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 268 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
221 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 269 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
222 <property name="settings.editor.selected.configurable" value="project.propDebugger" /> 270 <property name="settings.editor.selected.configurable" value="project.propDebugger" />
@@ -244,7 +292,10 @@ @@ -244,7 +292,10 @@
244 <option name="presentableId" value="Default" /> 292 <option name="presentableId" value="Default" />
245 <updated>1542334789245</updated> 293 <updated>1542334789245</updated>
246 <workItem from="1542334792985" duration="236000" /> 294 <workItem from="1542334792985" duration="236000" />
247 - <workItem from="1542249556873" duration="5520000" /> 295 + <workItem from="1542249556873" duration="6568000" />
  296 + <workItem from="1542594514355" duration="2482000" />
  297 + <workItem from="1542676616270" duration="2495000" />
  298 + <workItem from="1543297125303" duration="4846000" />
248 </task> 299 </task>
249 <task id="LOCAL-00001" summary="modal 模板"> 300 <task id="LOCAL-00001" summary="modal 模板">
250 <created>1542274356914</created> 301 <created>1542274356914</created>
@@ -253,17 +304,24 @@ @@ -253,17 +304,24 @@
253 <option name="project" value="LOCAL" /> 304 <option name="project" value="LOCAL" />
254 <updated>1542274356914</updated> 305 <updated>1542274356914</updated>
255 </task> 306 </task>
256 - <option name="localTasksCounter" value="2" /> 307 + <task id="LOCAL-00002" summary="上传到远程wumengyu">
  308 + <created>1542275805566</created>
  309 + <option name="number" value="00002" />
  310 + <option name="presentableId" value="LOCAL-00002" />
  311 + <option name="project" value="LOCAL" />
  312 + <updated>1542275805566</updated>
  313 + </task>
  314 + <option name="localTasksCounter" value="3" />
257 <servers /> 315 <servers />
258 </component> 316 </component>
259 <component name="TimeTrackingManager"> 317 <component name="TimeTrackingManager">
260 - <option name="totallyTimeSpent" value="5756000" /> 318 + <option name="totallyTimeSpent" value="16627000" />
261 </component> 319 </component>
262 <component name="ToolWindowManager"> 320 <component name="ToolWindowManager">
263 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 321 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
264 <editor active="true" /> 322 <editor active="true" />
265 <layout> 323 <layout>
266 - <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" /> 324 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
267 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 325 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
268 <window_info id="Favorites" order="2" side_tool="true" /> 326 <window_info id="Favorites" order="2" side_tool="true" />
269 <window_info anchor="bottom" id="Message" order="0" /> 327 <window_info anchor="bottom" id="Message" order="0" />
@@ -274,9 +332,9 @@ @@ -274,9 +332,9 @@
274 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 332 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
275 <window_info anchor="bottom" id="TODO" order="6" /> 333 <window_info anchor="bottom" id="TODO" order="6" />
276 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 334 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
277 - <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.329718" /> 335 + <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
278 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" /> 336 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
279 - <window_info anchor="bottom" id="Version Control" order="10" weight="0.3275488" /> 337 + <window_info anchor="bottom" id="Version Control" order="10" weight="0.34273317" />
280 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 338 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
281 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 339 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
282 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 340 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -316,19 +374,13 @@ @@ -316,19 +374,13 @@
316 </component> 374 </component>
317 <component name="VcsManagerConfiguration"> 375 <component name="VcsManagerConfiguration">
318 <MESSAGE value="modal 模板" /> 376 <MESSAGE value="modal 模板" />
319 - <option name="LAST_COMMIT_MESSAGE" value="modal 模板" /> 377 + <MESSAGE value="上传到远程wumengyu" />
  378 + <option name="LAST_COMMIT_MESSAGE" value="上传到远程wumengyu" />
320 </component> 379 </component>
321 <component name="editorHistoryManager"> 380 <component name="editorHistoryManager">
322 <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json" /> 381 <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json" />
323 <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml" /> 382 <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml" />
324 <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss" /> 383 <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss" />
325 - <entry file="file://$PROJECT_DIR$/app.json">  
326 - <provider selected="true" editor-type-id="text-editor">  
327 - <state relative-caret-position="418">  
328 - <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />  
329 - </state>  
330 - </provider>  
331 - </entry>  
332 <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml"> 384 <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
333 <provider selected="true" editor-type-id="text-editor" /> 385 <provider selected="true" editor-type-id="text-editor" />
334 </entry> 386 </entry>
@@ -341,37 +393,38 @@ @@ -341,37 +393,38 @@
341 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml"> 393 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
342 <provider selected="true" editor-type-id="text-editor" /> 394 <provider selected="true" editor-type-id="text-editor" />
343 </entry> 395 </entry>
344 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">  
345 - <provider selected="true" editor-type-id="text-editor" />  
346 - </entry>  
347 - <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">  
348 - <provider selected="true" editor-type-id="text-editor" />  
349 - </entry>  
350 <entry file="file://$PROJECT_DIR$/project.config.json"> 396 <entry file="file://$PROJECT_DIR$/project.config.json">
351 <provider selected="true" editor-type-id="text-editor"> 397 <provider selected="true" editor-type-id="text-editor">
352 <state relative-caret-position="352"> 398 <state relative-caret-position="352">
353 - <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" /> 399 + <caret line="16" column="21" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
354 </state> 400 </state>
355 </provider> 401 </provider>
356 </entry> 402 </entry>
357 <entry file="file://$PROJECT_DIR$/templates/templates.wxss"> 403 <entry file="file://$PROJECT_DIR$/templates/templates.wxss">
358 <provider selected="true" editor-type-id="text-editor"> 404 <provider selected="true" editor-type-id="text-editor">
359 <state> 405 <state>
360 - <caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" /> 406 + <caret column="34" selection-start-column="34" selection-end-column="34" />
361 </state> 407 </state>
362 </provider> 408 </provider>
363 </entry> 409 </entry>
364 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml"> 410 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
365 <provider selected="true" editor-type-id="text-editor"> 411 <provider selected="true" editor-type-id="text-editor">
366 - <state relative-caret-position="608">  
367 - <caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" /> 412 + <state relative-caret-position="550">
  413 + <caret line="25" column="28" selection-start-line="25" selection-start-column="28" selection-end-line="25" selection-end-column="28" />
368 </state> 414 </state>
369 </provider> 415 </provider>
370 </entry> 416 </entry>
371 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxss"> 417 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
  418 + <provider selected="true" editor-type-id="text-editor">
  419 + <state relative-caret-position="220">
  420 + <caret line="10" selection-start-line="10" selection-end-line="12" selection-end-column="21" />
  421 + </state>
  422 + </provider>
  423 + </entry>
  424 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxss">
372 <provider selected="true" editor-type-id="text-editor"> 425 <provider selected="true" editor-type-id="text-editor">
373 - <state relative-caret-position="22">  
374 - <caret line="1" selection-start-line="1" selection-end-line="2" /> 426 + <state relative-caret-position="924">
  427 + <caret line="42" selection-start-line="42" selection-end-line="59" selection-end-column="1" />
375 </state> 428 </state>
376 </provider> 429 </provider>
377 </entry> 430 </entry>
@@ -382,24 +435,115 @@ @@ -382,24 +435,115 @@
382 </state> 435 </state>
383 </provider> 436 </provider>
384 </entry> 437 </entry>
  438 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
  439 + <provider selected="true" editor-type-id="text-editor">
  440 + <state relative-caret-position="1100">
  441 + <caret line="50" column="42" selection-start-line="50" selection-start-column="42" selection-end-line="50" selection-end-column="42" />
  442 + </state>
  443 + </provider>
  444 + </entry>
385 <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js"> 445 <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
386 <provider selected="true" editor-type-id="text-editor"> 446 <provider selected="true" editor-type-id="text-editor">
387 - <state relative-caret-position="462"> 447 + <state relative-caret-position="924">
388 <caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" /> 448 <caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
389 </state> 449 </state>
390 </provider> 450 </provider>
391 </entry> 451 </entry>
  452 + <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
  453 + <provider selected="true" editor-type-id="text-editor" />
  454 + </entry>
  455 + <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
  456 + <provider selected="true" editor-type-id="text-editor" />
  457 + </entry>
  458 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.json">
  459 + <provider selected="true" editor-type-id="text-editor">
  460 + <state relative-caret-position="44">
  461 + <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
  462 + </state>
  463 + </provider>
  464 + </entry>
  465 + <entry file="file://$PROJECT_DIR$/app.js">
  466 + <provider selected="true" editor-type-id="text-editor">
  467 + <state relative-caret-position="47">
  468 + <caret line="58" column="67" lean-forward="true" selection-start-line="58" selection-start-column="67" selection-end-line="58" selection-end-column="67" />
  469 + <folding>
  470 + <element signature="n#!!doc" expanded="true" />
  471 + </folding>
  472 + </state>
  473 + </provider>
  474 + </entry>
  475 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
  476 + <provider selected="true" editor-type-id="text-editor">
  477 + <state relative-caret-position="154">
  478 + <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
  479 + </state>
  480 + </provider>
  481 + </entry>
  482 + <entry file="file://$PROJECT_DIR$/pages/start/start.js">
  483 + <provider selected="true" editor-type-id="text-editor">
  484 + <state relative-caret-position="374">
  485 + <caret line="29" column="49" lean-forward="true" selection-start-line="29" selection-start-column="12" selection-end-line="29" selection-end-column="49" />
  486 + </state>
  487 + </provider>
  488 + </entry>
  489 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
  490 + <provider selected="true" editor-type-id="text-editor">
  491 + <state relative-caret-position="880">
  492 + <caret line="40" lean-forward="true" selection-start-line="40" selection-end-line="40" />
  493 + </state>
  494 + </provider>
  495 + </entry>
392 <entry file="file://$PROJECT_DIR$/templates/templates.wxml"> 496 <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
393 <provider selected="true" editor-type-id="text-editor"> 497 <provider selected="true" editor-type-id="text-editor">
394 - <state relative-caret-position="718">  
395 - <caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" /> 498 + <state relative-caret-position="374">
  499 + <caret line="29" column="65" selection-start-line="29" selection-start-column="65" selection-end-line="29" selection-end-column="65" />
396 </state> 500 </state>
397 </provider> 501 </provider>
398 </entry> 502 </entry>
399 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml"> 503 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
  504 + <provider selected="true" editor-type-id="text-editor">
  505 + <state relative-caret-position="506">
  506 + <caret line="98" column="64" selection-start-line="98" selection-start-column="64" selection-end-line="98" selection-end-column="64" />
  507 + <folding>
  508 + <element signature="n#!!doc" expanded="true" />
  509 + <element signature="e#1018#1103#0" />
  510 + <element signature="e#1121#1191#0" />
  511 + <element signature="e#1219#1288#0" />
  512 + <element signature="e#1321#1468#0" />
  513 + <element signature="e#1499#1619#0" />
  514 + <element signature="e#1750#1766#0" />
  515 + </folding>
  516 + </state>
  517 + </provider>
  518 + </entry>
  519 + <entry file="file://$PROJECT_DIR$/app.json">
  520 + <provider selected="true" editor-type-id="text-editor">
  521 + <state relative-caret-position="440">
  522 + <caret line="20" column="38" selection-start-line="20" selection-start-column="38" selection-end-line="20" selection-end-column="38" />
  523 + </state>
  524 + </provider>
  525 + </entry>
  526 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.json">
  527 + <provider selected="true" editor-type-id="text-editor" />
  528 + </entry>
  529 + <entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
  530 + <provider selected="true" editor-type-id="text-editor">
  531 + <state relative-caret-position="132">
  532 + <caret line="6" column="15" lean-forward="true" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" />
  533 + </state>
  534 + </provider>
  535 + </entry>
  536 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
  537 + <provider selected="true" editor-type-id="text-editor">
  538 + <state relative-caret-position="550">
  539 + <caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
  540 + </state>
  541 + </provider>
  542 + </entry>
  543 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
400 <provider selected="true" editor-type-id="text-editor"> 544 <provider selected="true" editor-type-id="text-editor">
401 - <state relative-caret-position="370">  
402 - <caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" /> 545 + <state relative-caret-position="198">
  546 + <caret line="9" column="35" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" />
403 </state> 547 </state>
404 </provider> 548 </provider>
405 </entry> 549 </entry>
@@ -53,7 +53,7 @@ App({ @@ -53,7 +53,7 @@ App({
53 //init 53 //init
54 let that = this; 54 let that = this;
55 let postData = data; 55 let postData = data;
56 - let baseUrl = 'http://informationxcx.w.bronet.cn/api'; 56 + let baseUrl = 'http://science.w.bronet.cn/api';
57 //网络请求 57 //网络请求
58 let header = { 58 let header = {
59 'content-type': 'application/x-www-form-urlencoded' 59 'content-type': 'application/x-www-form-urlencoded'
1 { 1 {
2 "pages": [ 2 "pages": [
  3 + "pages/start/start",
3 "pages/index/index", 4 "pages/index/index",
4 "pages/index/confirm-appointment-info/confirm-appointment-info", 5 "pages/index/confirm-appointment-info/confirm-appointment-info",
5 "pages/index/phone-code/phone-code", 6 "pages/index/phone-code/phone-code",
@@ -23,8 +24,7 @@ @@ -23,8 +24,7 @@
23 "pages/clock/punchAppealDetail2/punchAppealDetail2", 24 "pages/clock/punchAppealDetail2/punchAppealDetail2",
24 "pages/clock/punchAppealDetail/punchAppealDetail", 25 "pages/clock/punchAppealDetail/punchAppealDetail",
25 "pages/clock/punchAppeal/punchAppeal", 26 "pages/clock/punchAppeal/punchAppeal",
26 - "pages/clock/clock",  
27 - "pages/start/start" 27 + "pages/clock/clock"
28 ], 28 ],
29 "window": { 29 "window": {
30 "backgroundTextStyle": "light", 30 "backgroundTextStyle": "light",
1 // pages/index/activity-detail/activity-detail.js 1 // pages/index/activity-detail/activity-detail.js
  2 +const app = getApp();
2 Page({ 3 Page({
3 4
4 /** 5 /**
@@ -6,16 +7,33 @@ Page({ @@ -6,16 +7,33 @@ Page({
6 */ 7 */
7 data: { 8 data: {
8 is_agree: true, 9 is_agree: true,
  10 + detail: {},
9 }, 11 },
10 clickAgreeBtn() { 12 clickAgreeBtn() {
11 this.setData({is_agree: !this.data.is_agree}); 13 this.setData({is_agree: !this.data.is_agree});
12 console.log(this.data.is_agree); 14 console.log(this.data.is_agree);
13 }, 15 },
  16 + getDetail() {
  17 + let url = '/portal/Experiment/detail';
  18 + let params = {
  19 + id: this.data.test_id,//当前实验的id
  20 + };
  21 + let headers= {
  22 + "XX-token": wx.getStorageSync('token')
  23 + };
  24 + app.post(url, params,headers).then((res) => {
  25 + console.log(res);
  26 + this.setData({detail: res})
  27 + // console.log(this.data.this_week_test_info);
  28 + })
  29 + },
14 /** 30 /**
15 * 生命周期函数--监听页面加载 31 * 生命周期函数--监听页面加载
16 */ 32 */
17 onLoad: function (options) { 33 onLoad: function (options) {
18 - 34 + console.log(options);
  35 + this.setData({test_id: +options.id});
  36 + this.getDetail()
19 }, 37 },
20 38
21 /** 39 /**
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <view class="title"> 7 <view class="title">
8 <view class="line"></view> 8 <view class="line"></view>
9 <view class="test_detail"> 9 <view class="test_detail">
10 - <text>科学队长实验室：雷电的产生！</text> 10 + <text>{{detail.name}}科学队长实验室：雷电的产生！</text>
11 <view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。</view> 11 <view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。</view>
12 </view> 12 </view>
13 </view> 13 </view>
@@ -5,7 +5,7 @@ const app = getApp() @@ -5,7 +5,7 @@ const app = getApp()
5 Page({ 5 Page({
6 data: { 6 data: {
7 hasPhone: true, 7 hasPhone: true,
8 - imgUrls:[ 8 + imgUrls: [
9 {'url': '../../images/banner.jpg'}, 9 {'url': '../../images/banner.jpg'},
10 {'url': '../../images/banner.jpg'}, 10 {'url': '../../images/banner.jpg'},
11 {'url': '../../images/banner.jpg'},], 11 {'url': '../../images/banner.jpg'},],
@@ -13,19 +13,15 @@ Page({ @@ -13,19 +13,15 @@ Page({
13 interval: 2000, //间隔时间 13 interval: 2000, //间隔时间
14 duration: 500, //滑动时间 14 duration: 500, //滑动时间
15 this_week_test_info: { 15 this_week_test_info: {
16 - info: [  
17 - {time: '11月01号-11月07号',url: '../../images/test_img.jpg',},  
18 - {time: '11月08号-11月14号',url: '../../images/test_img.jpg'},  
19 - ],  
20 is_this_week: true, 16 is_this_week: true,
21 ordered: false, 17 ordered: false,
22 is_past: false, 18 is_past: false,
23 }, 19 },
24 past_test_info: { 20 past_test_info: {
25 info: [ 21 info: [
26 - {time: '10月01号-10月07号',url: '../../images/test_img.jpg',},  
27 - {time: '10月08号-10月14号',url: '../../images/test_img.jpg'},  
28 - {time: '10月15号-10月21号',url: '../../images/test_img.jpg'}, 22 + {time: '10月01号-10月07号', url: '../../images/test_img.jpg',},
  23 + {time: '10月08号-10月14号', url: '../../images/test_img.jpg'},
  24 + {time: '10月15号-10月21号', url: '../../images/test_img.jpg'},
29 ], 25 ],
30 is_this_week: false, 26 is_this_week: false,
31 ordered: false, 27 ordered: false,
@@ -51,39 +47,77 @@ Page({ @@ -51,39 +47,77 @@ Page({
51 wx.navigateTo({url: './activity-detail/activity-detail'}) 47 wx.navigateTo({url: './activity-detail/activity-detail'})
52 }, 48 },
53 //前往预约 49 //前往预约
54 - goAppointment (e) { 50 + goAppointment(e) {
55 const current = e.currentTarget.dataset.index; 51 const current = e.currentTarget.dataset.index;
56 wx.navigateTo({url: './go-appointment/go-appointment'}) 52 wx.navigateTo({url: './go-appointment/go-appointment'})
57 }, 53 },
58 - onLoad: function () {  
59 - if (app.globalData.userInfo) {  
60 - this.setData({  
61 - userInfo: app.globalData.userInfo,  
62 - hasUserInfo: true  
63 - })  
64 - } else if (this.data.canIUse){  
65 - // 由于 getUserInfo 是网络请求，可能会在 Page.onLoad 之后才返回  
66 - // 所以此处加入 callback 以防止这种情况  
67 - app.userInfoReadyCallback = res => {  
68 - this.setData({  
69 - userInfo: res.userInfo,  
70 - hasUserInfo: true 54 + //获取轮播图
  55 + getSlideImage() {
  56 + let url = '/portal/Index/index';
  57 + let params = {
  58 + city: this.data.city,
  59 + };
  60 + app.post(url, params).then((ret) => {
  61 + wx.setStorageSync('token', ret.token)
  62 + app.globalData.userInfo = ret.user_type
  63 + // console.log('userInfo',app.globalData.userInfo,ret);
  64 + if (ret.user_type == 2) {
  65 + wx.switchTab({
  66 + url: '/pages/index/index',
71 }) 67 })
72 } 68 }
73 - } else {  
74 - // 在没有 open-type=getUserInfo 版本的兼容处理  
75 - wx.getUserInfo({  
76 - success: res => {  
77 - app.globalData.userInfo = res.userInfo  
78 - this.setData({  
79 - userInfo: res.userInfo,  
80 - hasUserInfo: true  
81 }) 69 })
  70 + },
  71 + //获取本周实验
  72 + getTheWeekTest() {
  73 + let url = '/portal/Index/now';
  74 + app.post(url, {}).then((res) => {
  75 + console.log(res);
  76 + this.setData({this_week_test_info: res})
  77 + console.log(this.data.this_week_test_info);
  78 + })
  79 + },
  80 + //查看本周实验详情
  81 + goDetail() {
  82 + wx.navigateTo({url: '/pages/index/activity-detail/activity-detail?test_id=' + this.data.this_week_test_info.id})
  83 + },
  84 + //获取往期实验
  85 + getPastWeekTest() {
  86 + let url = '/portal/Index/history';
  87 + let params = {
  88 + page: 1,
82 } 89 }
  90 + app.post(url, params,{}).then((res) => {
  91 + console.log(res);
  92 + this.setData({past_test_info: res})
  93 + // console.log(this.data.this_week_test_info);
83 }) 94 })
  95 + },
  96 + //查看往期实验详情
  97 + goPastDetail(e) {
  98 + const id = e.currentTarget.dataset.id;
  99 + wx.navigateTo({url: '/pages/index/activity-detail/activity-detail?test_id=' + id})
  100 + },
  101 + onLoad: function () {
  102 + this.getTheWeekTest();
  103 + this.getPastWeekTest();
  104 + wx.getLocation({
  105 + type: 'wgs84',
  106 + success: function(res) {
  107 + console.log(res);
  108 + let url = '/public/getAddressInfoByCoordinate';
  109 + let params = {
  110 + latitude: res.latitude,//纬度
  111 + longitude: res.longitude//经度
  112 + };
  113 + // app.post(url,params).then((res) => {
  114 + // // console.log('获取城市',res);
  115 + // self.setData({city: res.city})
  116 + // })
84 } 117 }
  118 + });
85 }, 119 },
86 - getUserInfo: function(e) { 120 + getUserInfo: function (e) {
87 console.log(e) 121 console.log(e)
88 app.globalData.userInfo = e.detail.userInfo 122 app.globalData.userInfo = e.detail.userInfo
89 this.setData({ 123 this.setData({
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
34 <!--实验列表--> 34 <!--实验列表-->
35 <import src="/templates/templates.wxml" /> 35 <import src="/templates/templates.wxml" />
36 <view class="past_template"> 36 <view class="past_template">
37 - <template is="experiment" data="{{...this_week_test_info}}"></template>  
38 - <template is="experiment" data="{{...past_test_info}}"></template> 37 + <template is="this-experiment" data="{{this_week_test_info}}"></template>
  38 + <template is="past-experiment" data="{{...past_test_info}}"></template>
39 </view> 39 </view>
40 </view> 40 </view>
@@ -55,11 +55,11 @@ Page({ @@ -55,11 +55,11 @@ Page({
55 let url = '/wxapp/public/getSessionKey' 55 let url = '/wxapp/public/getSessionKey'
56 wx.login({ 56 wx.login({
57 success: function (res) { 57 success: function (res) {
58 - // console.log(res) 58 + console.log(res)
59 app.post(url, { 59 app.post(url, {
60 code: res.code 60 code: res.code
61 }, {}).then((ret) => { 61 }, {}).then((ret) => {
62 - // console.log('res',ret); 62 + console.log('res',ret);
63 that.setData({ 63 that.setData({
64 openid: ret.openid, 64 openid: ret.openid,
65 session_key: ret.session_key 65 session_key: ret.session_key
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 }, 12 },
13 "compileType": "miniprogram", 13 "compileType": "miniprogram",
14 "libVersion": "2.4.0", 14 "libVersion": "2.4.0",
15 - "appid": "wx48319d952ea4e37f", 15 + "appid": "wxaab44bbcfc0e5bc5",
16 "projectname": "science", 16 "projectname": "science",
17 "debugOptions": { 17 "debugOptions": {
18 "hidedInDevtools": [] 18 "hidedInDevtools": []
1 -<template name="experiment">  
2 - <view class='experiment_box'> 1 +<template name="this-experiment">
  2 + <view class='experiment_box' bindtap="goDetail">
3 <view class="title_box"> 3 <view class="title_box">
4 <view class="line"></view> 4 <view class="line"></view>
5 - <text wx:if="{{is_this_week}}">本周实验</text>  
6 - <text wx:if="{{!is_this_week}}">往期实验</text> 5 + <text>本周实验</text>
7 </view> 6 </view>
8 7
9 - <view wx:for="{{info}}" wx:key="index" data-index="{{index}}" bindtap="goTestDetail"> 8 + <view>
10 <view class="test_box"> 9 <view class="test_box">
11 - <view class="time">{{item.time}}</view> 10 + <view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view>
12 <view class="img_box"> 11 <view class="img_box">
13 - <image src="{{item.url}}"></image> 12 + <image src="{{this_week_test_info.thumb}}"></image>
14 </view> 13 </view>
15 </view> 14 </view>
16 15
17 <view class="order_box"> 16 <view class="order_box">
18 - <text wx:if="{{!ordered && !is_past}}" catchtap="goAppointment" data-index="{{index}}">前往预约</text>  
19 - <text wx:if="{{is_past}}">查看</text> 17 + <text catchtap="goAppointment" data-index="{{index}}">前往预约</text>
  18 + <!--<text wx:if="{{is_past}}">查看</text>-->
  19 + </view>
  20 + </view>
  21 + </view>
  22 +</template>
  23 +<template name="past-experiment">
  24 + <view class='experiment_box' bindtap="goPastDetail">
  25 + <view class="title_box">
  26 + <view class="line"></view>
  27 + <text>往期实验</text>
  28 + </view>
  29 +
  30 + <view wx:for="{{list}}" wx:key="index" data-id="{{item.id}}">
  31 + <view class="test_box">
  32 + <view class="time">{{item.start_time}} - {{item.end_time}}</view>
  33 + <view class="img_box">
  34 + <image src="{{item.thumb}}"></image>
  35 + </view>
  36 + </view>
  37 +
  38 + <view class="order_box">
  39 + <!--<text wx:if="{{!ordered}}" catchtap="goAppointment" data-index="{{index}}">前往预约</text>-->
  40 + <text>查看</text>
20 </view> 41 </view>
21 </view> 42 </view>
22 </view> 43 </view>