miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 452bb139ae5d5e430b8633357171f9fc40109338 1 个父辈 7d719c52

优化预约

内嵌 并排对比
正在显示 4 个修改的文件 包含 185 行增加 和 227 行删除
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="添加未购卡片"> 4 + <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="去掉测试数据">
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/my/appointmentRecord/appointmentRecord.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/pages/my/charge/charge.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/charge/charge.wxml" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/pages/my/charge/charge.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/charge/charge.wxss" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
10 </list> 9 </list>
11 <ignored path="$PROJECT_DIR$/.tmp/" /> 10 <ignored path="$PROJECT_DIR$/.tmp/" />
12 <ignored path="$PROJECT_DIR$/temp/" /> 11 <ignored path="$PROJECT_DIR$/temp/" />
@@ -26,44 +25,45 @@ @@ -26,44 +25,45 @@
26 <entry key="project.open.time.1" value="9" /> 25 <entry key="project.open.time.1" value="9" />
27 <entry key="project.open.time.10" value="1" /> 26 <entry key="project.open.time.10" value="1" />
28 <entry key="project.open.time.13" value="1" /> 27 <entry key="project.open.time.13" value="1" />
  28 + <entry key="project.open.time.14" value="1" />
29 <entry key="project.open.time.2" value="3" /> 29 <entry key="project.open.time.2" value="3" />
30 <entry key="project.open.time.8" value="3" /> 30 <entry key="project.open.time.8" value="3" />
31 <entry key="project.open.time.9" value="2" /> 31 <entry key="project.open.time.9" value="2" />
32 - <entry key="project.opened" value="25" /> 32 + <entry key="project.opened" value="26" />
33 </counts> 33 </counts>
34 </usages-collector> 34 </usages-collector>
35 <usages-collector id="statistics.file.extensions.open"> 35 <usages-collector id="statistics.file.extensions.open">
36 <counts> 36 <counts>
37 - <entry key="js" value="172" /> 37 + <entry key="js" value="174" />
38 <entry key="json" value="31" /> 38 <entry key="json" value="31" />
39 - <entry key="wxml" value="138" /> 39 + <entry key="wxml" value="141" />
40 <entry key="wxss" value="54" /> 40 <entry key="wxss" value="54" />
41 </counts> 41 </counts>
42 </usages-collector> 42 </usages-collector>
43 <usages-collector id="statistics.file.types.open"> 43 <usages-collector id="statistics.file.types.open">
44 <counts> 44 <counts>
45 <entry key="CSS" value="54" /> 45 <entry key="CSS" value="54" />
46 - <entry key="HTML" value="138" /> 46 + <entry key="HTML" value="141" />
47 <entry key="JSON" value="31" /> 47 <entry key="JSON" value="31" />
48 - <entry key="JavaScript" value="172" /> 48 + <entry key="JavaScript" value="174" />
49 </counts> 49 </counts>
50 </usages-collector> 50 </usages-collector>
51 <usages-collector id="statistics.file.extensions.edit"> 51 <usages-collector id="statistics.file.extensions.edit">
52 <counts> 52 <counts>
53 - <entry key="js" value="15207" /> 53 + <entry key="js" value="15424" />
54 <entry key="json" value="158" /> 54 <entry key="json" value="158" />
55 - <entry key="txt" value="451" />  
56 - <entry key="wxml" value="3774" /> 55 + <entry key="txt" value="484" />
  56 + <entry key="wxml" value="3781" />
57 <entry key="wxss" value="1627" /> 57 <entry key="wxss" value="1627" />
58 </counts> 58 </counts>
59 </usages-collector> 59 </usages-collector>
60 <usages-collector id="statistics.file.types.edit"> 60 <usages-collector id="statistics.file.types.edit">
61 <counts> 61 <counts>
62 <entry key="CSS" value="1627" /> 62 <entry key="CSS" value="1627" />
63 - <entry key="HTML" value="3774" /> 63 + <entry key="HTML" value="3781" />
64 <entry key="JSON" value="158" /> 64 <entry key="JSON" value="158" />
65 - <entry key="JavaScript" value="15207" />  
66 - <entry key="PLAIN_TEXT" value="451" /> 65 + <entry key="JavaScript" value="15424" />
  66 + <entry key="PLAIN_TEXT" value="484" />
67 </counts> 67 </counts>
68 </usages-collector> 68 </usages-collector>
69 <usages-collector id="statistics.vcs.git.usages"> 69 <usages-collector id="statistics.vcs.git.usages">
@@ -76,103 +76,102 @@ @@ -76,103 +76,102 @@
76 <component name="FileEditorManager"> 76 <component name="FileEditorManager">
77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
78 <file pinned="false" current-in-tab="false"> 78 <file pinned="false" current-in-tab="false">
79 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml"> 79 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
80 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
81 - <state relative-caret-position="531">  
82 - <caret line="106" column="11" lean-forward="true" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" /> 81 + <state relative-caret-position="352">
  82 + <caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
83 </state> 83 </state>
84 </provider> 84 </provider>
85 </entry> 85 </entry>
86 </file> 86 </file>
87 <file pinned="false" current-in-tab="false"> 87 <file pinned="false" current-in-tab="false">
88 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js"> 88 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
89 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
90 - <state relative-caret-position="292">  
91 - <caret line="67" column="32" lean-forward="true" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" /> 90 + <state relative-caret-position="2596">
  91 + <caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
92 </state> 92 </state>
93 </provider> 93 </provider>
94 </entry> 94 </entry>
95 </file> 95 </file>
96 <file pinned="false" current-in-tab="false"> 96 <file pinned="false" current-in-tab="false">
97 - <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml"> 97 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
98 <provider selected="true" editor-type-id="text-editor"> 98 <provider selected="true" editor-type-id="text-editor">
99 - <state relative-caret-position="319">  
100 - <caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" /> 99 + <state relative-caret-position="968">
  100 + <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
101 </state> 101 </state>
102 </provider> 102 </provider>
103 </entry> 103 </entry>
104 </file> 104 </file>
105 <file pinned="false" current-in-tab="false"> 105 <file pinned="false" current-in-tab="false">
106 - <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss"> 106 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
107 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
108 - <state relative-caret-position="800">  
109 - <caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" /> 108 + <state relative-caret-position="990">
  109 + <caret line="45" column="71" selection-start-line="45" selection-start-column="71" selection-end-line="45" selection-end-column="71" />
110 </state> 110 </state>
111 </provider> 111 </provider>
112 </entry> 112 </entry>
113 </file> 113 </file>
114 - <file pinned="false" current-in-tab="true">  
115 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss"> 114 + <file pinned="false" current-in-tab="false">
  115 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
116 <provider selected="true" editor-type-id="text-editor"> 116 <provider selected="true" editor-type-id="text-editor">
117 - <state relative-caret-position="176">  
118 - <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" /> 117 + <state relative-caret-position="352">
  118 + <caret line="25" column="99" selection-start-line="25" selection-start-column="88" selection-end-line="25" selection-end-column="99" />
119 </state> 119 </state>
120 </provider> 120 </provider>
121 </entry> 121 </entry>
122 </file> 122 </file>
123 - <file pinned="false" current-in-tab="false">  
124 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml"> 123 + <file pinned="false" current-in-tab="true">
  124 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
125 <provider selected="true" editor-type-id="text-editor"> 125 <provider selected="true" editor-type-id="text-editor">
126 - <state relative-caret-position="242">  
127 - <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" /> 126 + <state relative-caret-position="616">
  127 + <caret line="246" column="40" lean-forward="true" selection-start-line="246" selection-start-column="40" selection-end-line="246" selection-end-column="40" />
128 </state> 128 </state>
129 </provider> 129 </provider>
130 </entry> 130 </entry>
131 </file> 131 </file>
132 <file pinned="false" current-in-tab="false"> 132 <file pinned="false" current-in-tab="false">
133 - <entry file="file://$PROJECT_DIR$/app.js"> 133 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
134 <provider selected="true" editor-type-id="text-editor"> 134 <provider selected="true" editor-type-id="text-editor">
135 - <state relative-caret-position="3454">  
136 - <caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" /> 135 + <state relative-caret-position="564">
  136 + <caret line="60" column="49" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="49" />
137 </state> 137 </state>
138 </provider> 138 </provider>
139 </entry> 139 </entry>
140 </file> 140 </file>
141 <file pinned="false" current-in-tab="false"> 141 <file pinned="false" current-in-tab="false">
142 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js"> 142 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
143 <provider selected="true" editor-type-id="text-editor"> 143 <provider selected="true" editor-type-id="text-editor">
144 - <state relative-caret-position="7942">  
145 - <caret line="361" column="28" lean-forward="true" selection-start-line="361" selection-start-column="28" selection-end-line="361" selection-end-column="28" /> 144 + <state relative-caret-position="345">
  145 + <caret line="67" column="59" lean-forward="true" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="59" />
  146 + <folding>
  147 + <element signature="n#!!doc" expanded="true" />
  148 + </folding>
146 </state> 149 </state>
147 </provider> 150 </provider>
148 </entry> 151 </entry>
149 </file> 152 </file>
150 <file pinned="false" current-in-tab="false"> 153 <file pinned="false" current-in-tab="false">
151 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js"> 154 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
152 <provider selected="true" editor-type-id="text-editor"> 155 <provider selected="true" editor-type-id="text-editor">
153 - <state relative-caret-position="1672">  
154 - <caret line="76" column="28" selection-start-line="76" selection-start-column="28" selection-end-line="76" selection-end-column="28" /> 156 + <state relative-caret-position="242">
  157 + <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
155 </state> 158 </state>
156 </provider> 159 </provider>
157 </entry> 160 </entry>
158 </file> 161 </file>
159 <file pinned="false" current-in-tab="false"> 162 <file pinned="false" current-in-tab="false">
160 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">  
161 - <provider selected="true" editor-type-id="text-editor" /> 163 + <entry file="file://$PROJECT_DIR$/app.js">
  164 + <provider selected="true" editor-type-id="text-editor">
  165 + <state relative-caret-position="3454">
  166 + <caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
  167 + </state>
  168 + </provider>
162 </entry> 169 </entry>
163 </file> 170 </file>
164 </leaf> 171 </leaf>
165 </component> 172 </component>
166 <component name="FindInProjectRecents"> 173 <component name="FindInProjectRecents">
167 <findStrings> 174 <findStrings>
168 - <find>reservation_id</find>  
169 - <find>currentTab</find>  
170 - <find>student_num</find>  
171 - <find>detail.num</find>  
172 - <find>state_data</find>  
173 - <find>student_list</find>  
174 - <find>buy</find>  
175 - <find>new_arr</find>  
176 <find>getStudentList</find> 175 <find>getStudentList</find>
177 <find>from_appointment</find> 176 <find>from_appointment</find>
178 <find>page_num</find> 177 <find>page_num</find>
@@ -195,6 +194,14 @@ @@ -195,6 +194,14 @@
195 <find>chargenum</find> 194 <find>chargenum</find>
196 <find>redeem_code</find> 195 <find>redeem_code</find>
197 <find>picker-box</find> 196 <find>picker-box</find>
  197 + <find>currentCity</find>
  198 + <find>city_index</find>
  199 + <find>currentTest</find>
  200 + <find>current_session_id</find>
  201 + <find>experiment_id</find>
  202 + <find>goAppointment</find>
  203 + <find>current_test_id</find>
  204 + <find>is_choose_test</find>
198 </findStrings> 205 </findStrings>
199 <dirStrings> 206 <dirStrings>
200 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir> 207 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
@@ -219,7 +226,6 @@ @@ -219,7 +226,6 @@
219 <component name="IdeDocumentHistory"> 226 <component name="IdeDocumentHistory">
220 <option name="CHANGED_PATHS"> 227 <option name="CHANGED_PATHS">
221 <list> 228 <list>
222 - <option value="$PROJECT_DIR$/app.wxss" />  
223 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" /> 229 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
224 <option value="$PROJECT_DIR$/templates/templates.wxss" /> 230 <option value="$PROJECT_DIR$/templates/templates.wxss" />
225 <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" /> 231 <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
@@ -235,7 +241,6 @@ @@ -235,7 +241,6 @@
235 <option value="$PROJECT_DIR$/templates/templates.wxml" /> 241 <option value="$PROJECT_DIR$/templates/templates.wxml" />
236 <option value="$PROJECT_DIR$/pages/clock/clock.wxml" /> 242 <option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
237 <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" /> 243 <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
238 - <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />  
239 <option value="$PROJECT_DIR$/app.json" /> 244 <option value="$PROJECT_DIR$/app.json" />
240 <option value="$PROJECT_DIR$/pages/start/start.js" /> 245 <option value="$PROJECT_DIR$/pages/start/start.js" />
241 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" /> 246 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
@@ -245,7 +250,6 @@ @@ -245,7 +250,6 @@
245 <option value="$PROJECT_DIR$/pages/index/index.wxss" /> 250 <option value="$PROJECT_DIR$/pages/index/index.wxss" />
246 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" /> 251 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
247 <option value="$PROJECT_DIR$/pages/my/my.wxss" /> 252 <option value="$PROJECT_DIR$/pages/my/my.wxss" />
248 - <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />  
249 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" /> 253 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
250 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" /> 254 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
251 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" /> 255 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
@@ -258,7 +262,6 @@ @@ -258,7 +262,6 @@
258 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" /> 262 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" />
259 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" /> 263 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" />
260 <option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" /> 264 <option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" />
261 - <option value="$PROJECT_DIR$/pages/index/index.js" />  
262 <option value="$PROJECT_DIR$/pages/index/index.wxml" /> 265 <option value="$PROJECT_DIR$/pages/index/index.wxml" />
263 <option value="$PROJECT_DIR$/pages/clock/clock.js" /> 266 <option value="$PROJECT_DIR$/pages/clock/clock.js" />
264 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" /> 267 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
@@ -270,6 +273,10 @@ @@ -270,6 +273,10 @@
270 <option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" /> 273 <option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
271 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" /> 274 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" />
272 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" /> 275 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" />
  276 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
  277 + <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" />
  278 + <option value="$PROJECT_DIR$/pages/index/index.js" />
  279 + <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
273 </list> 280 </list>
274 </option> 281 </option>
275 </component> 282 </component>
@@ -280,10 +287,10 @@ @@ -280,10 +287,10 @@
280 <sorting>DEFINITION_ORDER</sorting> 287 <sorting>DEFINITION_ORDER</sorting>
281 </component> 288 </component>
282 <component name="ProjectFrameBounds" extendedState="6"> 289 <component name="ProjectFrameBounds" extendedState="6">
283 - <option name="x" value="416" />  
284 - <option name="y" value="15" /> 290 + <option name="x" value="302" />
  291 + <option name="y" value="13" />
285 <option name="width" value="1936" /> 292 <option name="width" value="1936" />
286 - <option name="height" value="1047" /> 293 + <option name="height" value="1035" />
287 </component> 294 </component>
288 <component name="ProjectView"> 295 <component name="ProjectView">
289 <navigator proportions="" version="1"> 296 <navigator proportions="" version="1">
@@ -332,6 +339,13 @@ @@ -332,6 +339,13 @@
332 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 339 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
333 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 340 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
334 <item name="pages" type="462c0819:PsiDirectoryNode" /> 341 <item name="pages" type="462c0819:PsiDirectoryNode" />
  342 + <item name="index" type="462c0819:PsiDirectoryNode" />
  343 + <item name="go-appointment" type="462c0819:PsiDirectoryNode" />
  344 + </path>
  345 + <path>
  346 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  347 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  348 + <item name="pages" type="462c0819:PsiDirectoryNode" />
335 <item name="my" type="462c0819:PsiDirectoryNode" /> 349 <item name="my" type="462c0819:PsiDirectoryNode" />
336 </path> 350 </path>
337 <path> 351 <path>
@@ -463,7 +477,8 @@ @@ -463,7 +477,8 @@
463 <workItem from="1545354042642" duration="5649000" /> 477 <workItem from="1545354042642" duration="5649000" />
464 <workItem from="1545441360042" duration="4461000" /> 478 <workItem from="1545441360042" duration="4461000" />
465 <workItem from="1545627102606" duration="3505000" /> 479 <workItem from="1545627102606" duration="3505000" />
466 - <workItem from="1545700023575" duration="3152000" /> 480 + <workItem from="1545700023575" duration="5185000" />
  481 + <workItem from="1545726292000" duration="3104000" />
467 </task> 482 </task>
468 <task id="LOCAL-00001" summary="modal 模板"> 483 <task id="LOCAL-00001" summary="modal 模板">
469 <created>1542274356914</created> 484 <created>1542274356914</created>
@@ -549,14 +564,28 @@ @@ -549,14 +564,28 @@
549 <option name="project" value="LOCAL" /> 564 <option name="project" value="LOCAL" />
550 <updated>1545382588706</updated> 565 <updated>1545382588706</updated>
551 </task> 566 </task>
552 - <option name="localTasksCounter" value="13" /> 567 + <task id="LOCAL-00013" summary="修改预约记录样式，修改兑换picker点击范围">
  568 + <created>1545704797930</created>
  569 + <option name="number" value="00013" />
  570 + <option name="presentableId" value="LOCAL-00013" />
  571 + <option name="project" value="LOCAL" />
  572 + <updated>1545704797930</updated>
  573 + </task>
  574 + <task id="LOCAL-00014" summary="去掉测试数据">
  575 + <created>1545705005648</created>
  576 + <option name="number" value="00014" />
  577 + <option name="presentableId" value="LOCAL-00014" />
  578 + <option name="project" value="LOCAL" />
  579 + <updated>1545705005648</updated>
  580 + </task>
  581 + <option name="localTasksCounter" value="15" />
553 <servers /> 582 <servers />
554 </component> 583 </component>
555 <component name="TimeTrackingManager"> 584 <component name="TimeTrackingManager">
556 - <option name="totallyTimeSpent" value="258960000" /> 585 + <option name="totallyTimeSpent" value="264097000" />
557 </component> 586 </component>
558 <component name="ToolWindowManager"> 587 <component name="ToolWindowManager">
559 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> 588 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
560 <editor active="true" /> 589 <editor active="true" />
561 <layout> 590 <layout>
562 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" /> 591 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
@@ -623,7 +652,9 @@ @@ -623,7 +652,9 @@
623 <MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" /> 652 <MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
624 <MESSAGE value="添加默认图，测试用" /> 653 <MESSAGE value="添加默认图，测试用" />
625 <MESSAGE value="添加未购卡片" /> 654 <MESSAGE value="添加未购卡片" />
626 - <option name="LAST_COMMIT_MESSAGE" value="添加未购卡片" /> 655 + <MESSAGE value="修改预约记录样式，修改兑换picker点击范围" />
  656 + <MESSAGE value="去掉测试数据" />
  657 + <option name="LAST_COMMIT_MESSAGE" value="去掉测试数据" />
627 </component> 658 </component>
628 <component name="editorHistoryManager"> 659 <component name="editorHistoryManager">
629 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss"> 660 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
@@ -681,13 +712,6 @@ @@ -681,13 +712,6 @@
681 </state> 712 </state>
682 </provider> 713 </provider>
683 </entry> 714 </entry>
684 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">  
685 - <provider selected="true" editor-type-id="text-editor">  
686 - <state relative-caret-position="520">  
687 - <caret line="61" column="63" selection-start-line="61" selection-start-column="48" selection-end-line="61" selection-end-column="63" />  
688 - </state>  
689 - </provider>  
690 - </entry>  
691 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml"> 715 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
692 <provider selected="true" editor-type-id="text-editor"> 716 <provider selected="true" editor-type-id="text-editor">
693 <state relative-caret-position="212"> 717 <state relative-caret-position="212">
@@ -723,13 +747,6 @@ @@ -723,13 +747,6 @@
723 </state> 747 </state>
724 </provider> 748 </provider>
725 </entry> 749 </entry>
726 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">  
727 - <provider selected="true" editor-type-id="text-editor">  
728 - <state relative-caret-position="764">  
729 - <caret line="216" column="88" lean-forward="true" selection-start-line="216" selection-start-column="26" selection-end-line="216" selection-end-column="88" />  
730 - </state>  
731 - </provider>  
732 - </entry>  
733 <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js"> 750 <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
734 <provider selected="true" editor-type-id="text-editor"> 751 <provider selected="true" editor-type-id="text-editor">
735 <state relative-caret-position="478"> 752 <state relative-caret-position="478">
@@ -744,13 +761,6 @@ @@ -744,13 +761,6 @@
744 </state> 761 </state>
745 </provider> 762 </provider>
746 </entry> 763 </entry>
747 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">  
748 - <provider selected="true" editor-type-id="text-editor">  
749 - <state relative-caret-position="279">  
750 - <caret line="39" column="56" selection-start-line="39" selection-start-column="44" selection-end-line="39" selection-end-column="56" />  
751 - </state>  
752 - </provider>  
753 - </entry>  
754 <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml"> 764 <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
755 <provider selected="true" editor-type-id="text-editor"> 765 <provider selected="true" editor-type-id="text-editor">
756 <state relative-caret-position="220"> 766 <state relative-caret-position="220">
@@ -849,13 +859,6 @@ @@ -849,13 +859,6 @@
849 </state> 859 </state>
850 </provider> 860 </provider>
851 </entry> 861 </entry>
852 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">  
853 - <provider selected="true" editor-type-id="text-editor">  
854 - <state relative-caret-position="1694">  
855 - <caret line="77" column="60" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="60" />  
856 - </state>  
857 - </provider>  
858 - </entry>  
859 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml"> 862 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
860 <provider selected="true" editor-type-id="text-editor"> 863 <provider selected="true" editor-type-id="text-editor">
861 <state relative-caret-position="418"> 864 <state relative-caret-position="418">
@@ -881,10 +884,6 @@ @@ -881,10 +884,6 @@
881 <provider selected="true" editor-type-id="text-editor"> 884 <provider selected="true" editor-type-id="text-editor">
882 <state relative-caret-position="748"> 885 <state relative-caret-position="748">
883 <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" /> 886 <caret line="63" column="13" selection-start-line="63" selection-start-column="13" selection-end-line="63" selection-end-column="13" />
884 - <folding>  
885 - <element signature="n#view#0;n#view#0;n#block#0;n#!!top" />  
886 - <element signature="n#swiper#0;n#view#0;n#block#0;n#!!top" />  
887 - </folding>  
888 </state> 887 </state>
889 </provider> 888 </provider>
890 </entry> 889 </entry>
@@ -902,16 +901,6 @@ @@ -902,16 +901,6 @@
902 </state> 901 </state>
903 </provider> 902 </provider>
904 </entry> 903 </entry>
905 - <entry file="file://$PROJECT_DIR$/pages/index/index.js">  
906 - <provider selected="true" editor-type-id="text-editor">  
907 - <state relative-caret-position="264">  
908 - <caret line="13" column="96" selection-start-line="13" selection-start-column="96" selection-end-line="13" selection-end-column="96" />  
909 - <folding>  
910 - <element signature="n#!!doc" expanded="true" />  
911 - </folding>  
912 - </state>  
913 - </provider>  
914 - </entry>  
915 <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js"> 904 <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
916 <provider selected="true" editor-type-id="text-editor"> 905 <provider selected="true" editor-type-id="text-editor">
917 <state relative-caret-position="7942"> 906 <state relative-caret-position="7942">
@@ -929,41 +918,48 @@ @@ -929,41 +918,48 @@
929 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml"> 918 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
930 <provider selected="true" editor-type-id="text-editor" /> 919 <provider selected="true" editor-type-id="text-editor" />
931 </entry> 920 </entry>
932 - <entry file="file://$PROJECT_DIR$/app.js">  
933 - <provider selected="true" editor-type-id="text-editor">  
934 - <state relative-caret-position="3454">  
935 - <caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />  
936 - </state>  
937 - </provider>  
938 - </entry>  
939 <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml"> 921 <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
940 <provider selected="true" editor-type-id="text-editor"> 922 <provider selected="true" editor-type-id="text-editor">
941 - <state relative-caret-position="531">  
942 - <caret line="106" column="11" lean-forward="true" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" /> 923 + <state relative-caret-position="2332">
  924 + <caret line="106" column="11" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" />
943 </state> 925 </state>
944 </provider> 926 </provider>
945 </entry> 927 </entry>
946 <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js"> 928 <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
947 <provider selected="true" editor-type-id="text-editor"> 929 <provider selected="true" editor-type-id="text-editor">
948 - <state relative-caret-position="292">  
949 - <caret line="67" column="32" lean-forward="true" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" /> 930 + <state relative-caret-position="1474">
  931 + <caret line="67" column="32" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
950 </state> 932 </state>
951 </provider> 933 </provider>
952 </entry> 934 </entry>
953 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml"> 935 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
954 <provider selected="true" editor-type-id="text-editor"> 936 <provider selected="true" editor-type-id="text-editor">
955 - <state relative-caret-position="319"> 937 + <state relative-caret-position="352">
956 <caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" /> 938 <caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
957 </state> 939 </state>
958 </provider> 940 </provider>
959 </entry> 941 </entry>
960 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss"> 942 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
961 <provider selected="true" editor-type-id="text-editor"> 943 <provider selected="true" editor-type-id="text-editor">
962 - <state relative-caret-position="800"> 944 + <state relative-caret-position="2596">
963 <caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" /> 945 <caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
964 </state> 946 </state>
965 </provider> 947 </provider>
966 </entry> 948 </entry>
  949 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
  950 + <provider selected="true" editor-type-id="text-editor">
  951 + <state relative-caret-position="968">
  952 + <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
  953 + </state>
  954 + </provider>
  955 + </entry>
  956 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
  957 + <provider selected="true" editor-type-id="text-editor">
  958 + <state relative-caret-position="990">
  959 + <caret line="45" column="71" selection-start-line="45" selection-start-column="71" selection-end-line="45" selection-end-column="71" />
  960 + </state>
  961 + </provider>
  962 + </entry>
967 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml"> 963 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
968 <provider selected="true" editor-type-id="text-editor"> 964 <provider selected="true" editor-type-id="text-editor">
969 <state relative-caret-position="242"> 965 <state relative-caret-position="242">
@@ -971,10 +967,41 @@ @@ -971,10 +967,41 @@
971 </state> 967 </state>
972 </provider> 968 </provider>
973 </entry> 969 </entry>
974 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss"> 970 + <entry file="file://$PROJECT_DIR$/app.js">
975 <provider selected="true" editor-type-id="text-editor"> 971 <provider selected="true" editor-type-id="text-editor">
976 - <state relative-caret-position="176">  
977 - <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" /> 972 + <state relative-caret-position="3454">
  973 + <caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
  974 + </state>
  975 + </provider>
  976 + </entry>
  977 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
  978 + <provider selected="true" editor-type-id="text-editor">
  979 + <state relative-caret-position="352">
  980 + <caret line="25" column="99" selection-start-line="25" selection-start-column="88" selection-end-line="25" selection-end-column="99" />
  981 + </state>
  982 + </provider>
  983 + </entry>
  984 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
  985 + <provider selected="true" editor-type-id="text-editor">
  986 + <state relative-caret-position="564">
  987 + <caret line="60" column="49" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="49" />
  988 + </state>
  989 + </provider>
  990 + </entry>
  991 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
  992 + <provider selected="true" editor-type-id="text-editor">
  993 + <state relative-caret-position="345">
  994 + <caret line="67" column="59" lean-forward="true" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="59" />
  995 + <folding>
  996 + <element signature="n#!!doc" expanded="true" />
  997 + </folding>
  998 + </state>
  999 + </provider>
  1000 + </entry>
  1001 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
  1002 + <provider selected="true" editor-type-id="text-editor">
  1003 + <state relative-caret-position="616">
  1004 + <caret line="246" column="40" lean-forward="true" selection-start-line="246" selection-start-column="40" selection-end-line="246" selection-end-column="40" />
978 </state> 1005 </state>
979 </provider> 1006 </provider>
980 </entry> 1007 </entry>
@@ -7,106 +7,20 @@ Page({ @@ -7,106 +7,20 @@ Page({
7 * 页面的初始数据 7 * 页面的初始数据
8 */ 8 */
9 data: { 9 data: {
  10 + currentTest:0,
10 cityList: [], 11 cityList: [],
11 // city_index: 0, 12 // city_index: 0,
12 - currentCity: '北京市', 13 + currentCity: '',
13 current_test_id: '', 14 current_test_id: '',
14 is_change: false, 15 is_change: false,
15 is_choose_session: false, 16 is_choose_session: false,
16 - is_choose_test: false, 17 + // is_choose_test: false,
17 description: '', 18 description: '',
18 session_list: {}, 19 session_list: {},
19 show_submit_btn: false, 20 show_submit_btn: false,
20 student_num: 0, 21 student_num: 0,
21 - areaTest: [{  
22 - area: '朝阳区',  
23 - list: [{  
24 - id: 1,  
25 - name: '798实验室'  
26 - }, {  
27 - id: 2,  
28 - name: '木鱼湖实验室'  
29 - }, {  
30 - id: 3,  
31 - name: '南锣鼓巷实验室'  
32 - }]  
33 - },  
34 - {  
35 - area: '东城区',  
36 - list: [{  
37 - id: 4,  
38 - name: '798实验室'  
39 - }, {  
40 - id: 5,  
41 - name: '木鱼湖实验室'  
42 - }, {  
43 - id: 6,  
44 - name: '南锣鼓巷实验室'  
45 - }]  
46 - },  
47 - {  
48 - area: '西城区',  
49 - list: [{  
50 - id: 7,  
51 - name: '798实验室'  
52 - }, {  
53 - id: 11,  
54 - name: '木鱼湖实验室'  
55 - }, {  
56 - id: 8,  
57 - name: '南锣鼓巷实验室'  
58 - }]  
59 - },  
60 - {  
61 - area: '昌平区',  
62 - list: [{  
63 - id: 9,  
64 - name: '798实验室'  
65 - }, {  
66 - id: 12,  
67 - name: '木鱼湖实验室'  
68 - }, {  
69 - id: 10,  
70 - name: '南锣鼓巷实验室'  
71 - }]  
72 - },  
73 - ],  
74 - test: {  
75 - title: '798实验室,本实验室分为三个阶段，第一阶段由家长和孩子共同完成，第二阶段由孩子独立完成。家长在旁边指导，第三阶段巴拉巴拉',  
76 - list: [{  
77 - week: '周六',  
78 - date: '10月20日',  
79 - time: '10:00 — 11:30',  
80 - rest: 6  
81 - },  
82 - {  
83 - week: '周日',  
84 - date: '10月21日',  
85 - time: '15:00 — 16:30',  
86 - rest: 0  
87 - },  
88 - {  
89 - week: '周日',  
90 - date: '10月21日',  
91 - time: '15:00 — 16:30',  
92 - rest: 6  
93 - },  
94 - {  
95 - week: '周日',  
96 - date: '10月21日',  
97 - time: '15:00 — 16:30',  
98 - rest: 0  
99 - },  
100 - // {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},  
101 - // {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},  
102 - // {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},  
103 - // {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},  
104 - // {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},  
105 - // {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},  
106 - // {week:'周日',date: '10月21日',time:'15:00 — 16:30',rest: 6},  
107 - // {week:'周六',date: '10月20日',time:'10:00 — 11:30',rest: 6}  
108 - ]  
109 - }, 22 + areaTest: [],
  23 + test: {},
110 }, 24 },
111 25
112 //选择城市 26 //选择城市
@@ -115,8 +29,10 @@ Page({ @@ -115,8 +29,10 @@ Page({
115 this.setData({ 29 this.setData({
116 city_index: e.detail.value, 30 city_index: e.detail.value,
117 is_change: true, 31 is_change: true,
  32 + currentTest:0,
118 }); 33 });
119 - this.getChooseSession(this.data.cityList[e.detail.value]) 34 + this.getChooseSession(this.data.cityList[e.detail.value]);
  35 + wx.setStorageSync('choose-city',this.data.cityList[e.detail.value])
120 }, 36 },
121 //选择实验室 37 //选择实验室
122 chooseTest(e) { 38 chooseTest(e) {
@@ -128,7 +44,7 @@ Page({ @@ -128,7 +44,7 @@ Page({
128 this.setData({ 44 this.setData({
129 currentTest: current, 45 currentTest: current,
130 current_test_id: current_id, 46 current_test_id: current_id,
131 - is_choose_test: true, 47 + // is_choose_test: true,
132 // current_session_id: this.data.areaTest[current].lab_list ? this.data.areaTest[current].lab_list[0].session_list[0].id : '', 48 // current_session_id: this.data.areaTest[current].lab_list ? this.data.areaTest[current].lab_list[0].session_list[0].id : '',
133 // description: this.data.areaTest[current].lab_list[current].description 49 // description: this.data.areaTest[current].lab_list[current].description
134 }); 50 });
@@ -168,8 +84,8 @@ Page({ @@ -168,8 +84,8 @@ Page({
168 84
169 //点击单人预约 85 //点击单人预约
170 singleAppointment() { 86 singleAppointment() {
171 - if (!this.data.is_choose_session || !this.data.is_choose_test) {  
172 - wx.showToast({title: '请选择实验和场次!', icon: 'none'}) 87 + if (!this.data.is_choose_session) {
  88 + wx.showToast({title: '请选择实验场次!', icon: 'none'})
173 } else { 89 } else {
174 this.setData({ 90 this.setData({
175 show_submit_btn: true, 91 show_submit_btn: true,
@@ -183,8 +99,8 @@ Page({ @@ -183,8 +99,8 @@ Page({
183 99
184 //点击双人预约 100 //点击双人预约
185 doubleAppointment() { 101 doubleAppointment() {
186 - if (!this.data.is_choose_session || !this.data.is_choose_test) {  
187 - wx.showToast({title: '请选择实验和场次!', icon: 'none'}) 102 + if (!this.data.is_choose_session) {
  103 + wx.showToast({title: '请选择实验场次!', icon: 'none'})
188 } else { 104 } else {
189 this.setData({ 105 this.setData({
190 show_submit_btn: true, 106 show_submit_btn: true,
@@ -197,7 +113,7 @@ Page({ @@ -197,7 +113,7 @@ Page({
197 }, 113 },
198 //提交 114 //提交
199 submit() { 115 submit() {
200 - if (this.data.is_choose_session && this.data.is_choose_test) { 116 + if (this.data.is_choose_session) {
201 let url = '/portal/Experiment/submit_session'; 117 let url = '/portal/Experiment/submit_session';
202 let header = { 118 let header = {
203 "XX-token": wx.getStorageSync('token') 119 "XX-token": wx.getStorageSync('token')
@@ -234,6 +150,10 @@ Page({ @@ -234,6 +150,10 @@ Page({
234 // console.log(res); 150 // console.log(res);
235 var city_list = []; 151 var city_list = [];
236 res.forEach((item, index) => { 152 res.forEach((item, index) => {
  153 + if(item.city == wx.getStorageSync('city')){
  154 + console.log('item.city', item.city, wx.getStorageSync('city'));
  155 + this.setData({city_index:index})
  156 + }
237 city_list.push(item.city) 157 city_list.push(item.city)
238 }); 158 });
239 // console.log(city_list,res); 159 // console.log(city_list,res);
@@ -289,7 +209,7 @@ Page({ @@ -289,7 +209,7 @@ Page({
289 */ 209 */
290 onLoad: function (options) { 210 onLoad: function (options) {
291 const self = this; 211 const self = this;
292 - console.log('load',options); 212 + console.log('load-experiment_id',options);
293 self.setData({experiment_id: +options.experiment_id}); 213 self.setData({experiment_id: +options.experiment_id});
294 214
295 // this.data.areaTest.forEach((v, i) => { 215 // this.data.areaTest.forEach((v, i) => {
@@ -309,11 +229,20 @@ Page({ @@ -309,11 +229,20 @@ Page({
309 }, 229 },
310 getData() { 230 getData() {
311 const self = this; 231 const self = this;
312 - if (wx.getStorageSync('city')) { 232 + if ((wx.getStorageSync('city') === wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
313 const city = wx.getStorageSync('city'); 233 const city = wx.getStorageSync('city');
  234 + // console.log('city',city);
314 self.getChooseSession(city); 235 self.getChooseSession(city);
  236 + // console.log(self.data.currentCity);
315 self.setData({currentCity: city}) 237 self.setData({currentCity: city})
316 - } else { 238 + // console.log(self.data.currentCity);
  239 +
  240 + }else if((wx.getStorageSync('city') !== wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
  241 + const city = wx.getStorageSync('choose-city');
  242 + self.getChooseSession(city);
  243 + self.setData({currentCity: city})
  244 + } else if(wx.getStorageSync('city') === ''){
  245 + // console.log('aaa');
317 const city = '北京市'; 246 const city = '北京市';
318 self.getChooseSession(city); 247 self.getChooseSession(city);
319 } 248 }
@@ -22,7 +22,8 @@ @@ -22,7 +22,8 @@
22 <block wx:for="{{item.lab_list}}" wx:key="index"> 22 <block wx:for="{{item.lab_list}}" wx:key="index">
23 <view class="list-item" bindtap="chooseTest" data-index="{{index}}" 23 <view class="list-item" bindtap="chooseTest" data-index="{{index}}"
24 data-id="{{item.id}}"> 24 data-id="{{item.id}}">
25 - <image src="../../../images/blue_line.png" wx:if="{{current_test_id === item.id}}" 25 + <!--wx:if="{{current_test_id === item.id}}"-->
  26 + <image src="../../../images/blue_line.png" wx:if="{{currentTest === index}}"
26 class="blue-line"></image> 27 class="blue-line"></image>
27 <view class="test {{current_test_id === item.id?'change-color':''}}">{{item.name}}</view> 28 <view class="test {{current_test_id === item.id?'change-color':''}}">{{item.name}}</view>
28 </view> 29 </view>
@@ -64,6 +64,7 @@ Page({ @@ -64,6 +64,7 @@ Page({
64 //前往预约 64 //前往预约
65 goAppointment(e) { 65 goAppointment(e) {
66 const id = e.currentTarget.dataset.id; 66 const id = e.currentTarget.dataset.id;
  67 + console.log('实验室id', id);
67 wx.navigateTo({url: './go-appointment/go-appointment?experiment_id=' + id}) 68 wx.navigateTo({url: './go-appointment/go-appointment?experiment_id=' + id})
68 }, 69 },
69 //获取轮播图 70 //获取轮播图