miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 8dbccca50f2be231adbcf0022b38c6b26c9a618e 2 个父辈 6e898ba5 c8d3e3cb

合并分支 'wumengyu' 到 'master' 

Wumengyu



查看合并请求 !7
内嵌 并排对比
正在显示 5 个修改的文件 包含 223 行增加 和 255 行删除
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="添加未购卡片">  
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" />  
10 - </list> 4 + <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="优化预约" />
11 <ignored path="$PROJECT_DIR$/.tmp/" /> 5 <ignored path="$PROJECT_DIR$/.tmp/" />
12 <ignored path="$PROJECT_DIR$/temp/" /> 6 <ignored path="$PROJECT_DIR$/temp/" />
13 <ignored path="$PROJECT_DIR$/tmp/" /> 7 <ignored path="$PROJECT_DIR$/tmp/" />
@@ -21,49 +15,50 @@ @@ -21,49 +15,50 @@
21 <session id="-381596063"> 15 <session id="-381596063">
22 <usages-collector id="statistics.lifecycle.project"> 16 <usages-collector id="statistics.lifecycle.project">
23 <counts> 17 <counts>
24 - <entry key="project.closed" value="23" /> 18 + <entry key="project.closed" value="24" />
25 <entry key="project.open.time.0" value="6" /> 19 <entry key="project.open.time.0" value="6" />
26 <entry key="project.open.time.1" value="9" /> 20 <entry key="project.open.time.1" value="9" />
27 <entry key="project.open.time.10" value="1" /> 21 <entry key="project.open.time.10" value="1" />
28 <entry key="project.open.time.13" value="1" /> 22 <entry key="project.open.time.13" value="1" />
  23 + <entry key="project.open.time.14" value="1" />
29 <entry key="project.open.time.2" value="3" /> 24 <entry key="project.open.time.2" value="3" />
30 <entry key="project.open.time.8" value="3" /> 25 <entry key="project.open.time.8" value="3" />
31 <entry key="project.open.time.9" value="2" /> 26 <entry key="project.open.time.9" value="2" />
32 - <entry key="project.opened" value="25" /> 27 + <entry key="project.opened" value="26" />
33 </counts> 28 </counts>
34 </usages-collector> 29 </usages-collector>
35 <usages-collector id="statistics.file.extensions.open"> 30 <usages-collector id="statistics.file.extensions.open">
36 <counts> 31 <counts>
37 - <entry key="js" value="172" /> 32 + <entry key="js" value="175" />
38 <entry key="json" value="31" /> 33 <entry key="json" value="31" />
39 - <entry key="wxml" value="138" />  
40 - <entry key="wxss" value="54" /> 34 + <entry key="wxml" value="142" />
  35 + <entry key="wxss" value="55" />
41 </counts> 36 </counts>
42 </usages-collector> 37 </usages-collector>
43 <usages-collector id="statistics.file.types.open"> 38 <usages-collector id="statistics.file.types.open">
44 <counts> 39 <counts>
45 - <entry key="CSS" value="54" />  
46 - <entry key="HTML" value="138" /> 40 + <entry key="CSS" value="55" />
  41 + <entry key="HTML" value="142" />
47 <entry key="JSON" value="31" /> 42 <entry key="JSON" value="31" />
48 - <entry key="JavaScript" value="172" /> 43 + <entry key="JavaScript" value="175" />
49 </counts> 44 </counts>
50 </usages-collector> 45 </usages-collector>
51 <usages-collector id="statistics.file.extensions.edit"> 46 <usages-collector id="statistics.file.extensions.edit">
52 <counts> 47 <counts>
53 - <entry key="js" value="15207" /> 48 + <entry key="js" value="15424" />
54 <entry key="json" value="158" /> 49 <entry key="json" value="158" />
55 - <entry key="txt" value="451" />  
56 - <entry key="wxml" value="3774" /> 50 + <entry key="txt" value="488" />
  51 + <entry key="wxml" value="3781" />
57 <entry key="wxss" value="1627" /> 52 <entry key="wxss" value="1627" />
58 </counts> 53 </counts>
59 </usages-collector> 54 </usages-collector>
60 <usages-collector id="statistics.file.types.edit"> 55 <usages-collector id="statistics.file.types.edit">
61 <counts> 56 <counts>
62 <entry key="CSS" value="1627" /> 57 <entry key="CSS" value="1627" />
63 - <entry key="HTML" value="3774" /> 58 + <entry key="HTML" value="3781" />
64 <entry key="JSON" value="158" /> 59 <entry key="JSON" value="158" />
65 - <entry key="JavaScript" value="15207" />  
66 - <entry key="PLAIN_TEXT" value="451" /> 60 + <entry key="JavaScript" value="15424" />
  61 + <entry key="PLAIN_TEXT" value="488" />
67 </counts> 62 </counts>
68 </usages-collector> 63 </usages-collector>
69 <usages-collector id="statistics.vcs.git.usages"> 64 <usages-collector id="statistics.vcs.git.usages">
@@ -76,104 +71,102 @@ @@ -76,104 +71,102 @@
76 <component name="FileEditorManager"> 71 <component name="FileEditorManager">
77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 72 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
78 <file pinned="false" current-in-tab="false"> 73 <file pinned="false" current-in-tab="false">
79 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml"> 74 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
80 <provider selected="true" editor-type-id="text-editor"> 75 <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" /> 76 + <state relative-caret-position="990">
  77 + <caret line="45" column="71" selection-start-line="45" selection-start-column="71" selection-end-line="45" selection-end-column="71" />
83 </state> 78 </state>
84 </provider> 79 </provider>
85 </entry> 80 </entry>
86 </file> 81 </file>
87 <file pinned="false" current-in-tab="false"> 82 <file pinned="false" current-in-tab="false">
88 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js"> 83 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
89 <provider selected="true" editor-type-id="text-editor"> 84 <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" /> 85 + <state relative-caret-position="352">
  86 + <caret line="25" column="99" selection-start-line="25" selection-start-column="88" selection-end-line="25" selection-end-column="99" />
92 </state> 87 </state>
93 </provider> 88 </provider>
94 </entry> 89 </entry>
95 </file> 90 </file>
96 <file pinned="false" current-in-tab="false"> 91 <file pinned="false" current-in-tab="false">
97 - <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml"> 92 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
98 <provider selected="true" editor-type-id="text-editor"> 93 <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" /> 94 + <state relative-caret-position="3072">
  95 + <caret line="246" column="40" lean-forward="true" selection-start-line="246" selection-start-column="40" selection-end-line="246" selection-end-column="40" />
101 </state> 96 </state>
102 </provider> 97 </provider>
103 </entry> 98 </entry>
104 </file> 99 </file>
105 <file pinned="false" current-in-tab="false"> 100 <file pinned="false" current-in-tab="false">
106 - <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss"> 101 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
107 <provider selected="true" editor-type-id="text-editor"> 102 <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" /> 103 + <state relative-caret-position="528">
  104 + <caret line="39" column="29" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="29" />
110 </state> 105 </state>
111 </provider> 106 </provider>
112 </entry> 107 </entry>
113 </file> 108 </file>
114 <file pinned="false" current-in-tab="true"> 109 <file pinned="false" current-in-tab="true">
115 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss"> 110 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
116 <provider selected="true" editor-type-id="text-editor"> 111 <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" /> 112 + <state relative-caret-position="102">
  113 + <caret line="89" column="16" lean-forward="true" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
119 </state> 114 </state>
120 </provider> 115 </provider>
121 </entry> 116 </entry>
122 </file> 117 </file>
123 <file pinned="false" current-in-tab="false"> 118 <file pinned="false" current-in-tab="false">
124 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml"> 119 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
125 <provider selected="true" editor-type-id="text-editor"> 120 <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" /> 121 + <state relative-caret-position="528">
  122 + <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
128 </state> 123 </state>
129 </provider> 124 </provider>
130 </entry> 125 </entry>
131 </file> 126 </file>
132 <file pinned="false" current-in-tab="false"> 127 <file pinned="false" current-in-tab="false">
133 - <entry file="file://$PROJECT_DIR$/app.js"> 128 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
134 <provider selected="true" editor-type-id="text-editor"> 129 <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" /> 130 + <state relative-caret-position="564">
  131 + <caret line="60" column="49" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="49" />
137 </state> 132 </state>
138 </provider> 133 </provider>
139 </entry> 134 </entry>
140 </file> 135 </file>
141 <file pinned="false" current-in-tab="false"> 136 <file pinned="false" current-in-tab="false">
142 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js"> 137 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
143 <provider selected="true" editor-type-id="text-editor"> 138 <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" /> 139 + <state relative-caret-position="345">
  140 + <caret line="67" column="59" lean-forward="true" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="59" />
  141 + <folding>
  142 + <element signature="n#!!doc" expanded="true" />
  143 + </folding>
146 </state> 144 </state>
147 </provider> 145 </provider>
148 </entry> 146 </entry>
149 </file> 147 </file>
150 <file pinned="false" current-in-tab="false"> 148 <file pinned="false" current-in-tab="false">
151 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js"> 149 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
152 <provider selected="true" editor-type-id="text-editor"> 150 <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" /> 151 + <state relative-caret-position="242">
  152 + <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
155 </state> 153 </state>
156 </provider> 154 </provider>
157 </entry> 155 </entry>
158 </file> 156 </file>
159 <file pinned="false" current-in-tab="false"> 157 <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" /> 158 + <entry file="file://$PROJECT_DIR$/app.js">
  159 + <provider selected="true" editor-type-id="text-editor">
  160 + <state relative-caret-position="3454">
  161 + <caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
  162 + </state>
  163 + </provider>
162 </entry> 164 </entry>
163 </file> 165 </file>
164 </leaf> 166 </leaf>
165 </component> 167 </component>
166 <component name="FindInProjectRecents"> 168 <component name="FindInProjectRecents">
167 <findStrings> 169 <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>  
177 <find>from_appointment</find> 170 <find>from_appointment</find>
178 <find>page_num</find> 171 <find>page_num</find>
179 <find>id</find> 172 <find>id</find>
@@ -195,6 +188,15 @@ @@ -195,6 +188,15 @@
195 <find>chargenum</find> 188 <find>chargenum</find>
196 <find>redeem_code</find> 189 <find>redeem_code</find>
197 <find>picker-box</find> 190 <find>picker-box</find>
  191 + <find>currentCity</find>
  192 + <find>city_index</find>
  193 + <find>currentTest</find>
  194 + <find>current_session_id</find>
  195 + <find>experiment_id</find>
  196 + <find>goAppointment</find>
  197 + <find>current_test_id</find>
  198 + <find>textarea</find>
  199 + <find>is_choose_test</find>
198 </findStrings> 200 </findStrings>
199 <dirStrings> 201 <dirStrings>
200 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir> 202 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
@@ -219,7 +221,6 @@ @@ -219,7 +221,6 @@
219 <component name="IdeDocumentHistory"> 221 <component name="IdeDocumentHistory">
220 <option name="CHANGED_PATHS"> 222 <option name="CHANGED_PATHS">
221 <list> 223 <list>
222 - <option value="$PROJECT_DIR$/app.wxss" />  
223 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" /> 224 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
224 <option value="$PROJECT_DIR$/templates/templates.wxss" /> 225 <option value="$PROJECT_DIR$/templates/templates.wxss" />
225 <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" /> 226 <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
@@ -235,7 +236,6 @@ @@ -235,7 +236,6 @@
235 <option value="$PROJECT_DIR$/templates/templates.wxml" /> 236 <option value="$PROJECT_DIR$/templates/templates.wxml" />
236 <option value="$PROJECT_DIR$/pages/clock/clock.wxml" /> 237 <option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
237 <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" /> 238 <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" /> 239 <option value="$PROJECT_DIR$/app.json" />
240 <option value="$PROJECT_DIR$/pages/start/start.js" /> 240 <option value="$PROJECT_DIR$/pages/start/start.js" />
241 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" /> 241 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
@@ -245,7 +245,6 @@ @@ -245,7 +245,6 @@
245 <option value="$PROJECT_DIR$/pages/index/index.wxss" /> 245 <option value="$PROJECT_DIR$/pages/index/index.wxss" />
246 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" /> 246 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
247 <option value="$PROJECT_DIR$/pages/my/my.wxss" /> 247 <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" /> 248 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
250 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" /> 249 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
251 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" /> 250 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
@@ -258,7 +257,6 @@ @@ -258,7 +257,6 @@
258 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" /> 257 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" />
259 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" /> 258 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" />
260 <option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" /> 259 <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" /> 260 <option value="$PROJECT_DIR$/pages/index/index.wxml" />
263 <option value="$PROJECT_DIR$/pages/clock/clock.js" /> 261 <option value="$PROJECT_DIR$/pages/clock/clock.js" />
264 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" /> 262 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
@@ -270,6 +268,10 @@ @@ -270,6 +268,10 @@
270 <option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" /> 268 <option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
271 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" /> 269 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" />
272 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" /> 270 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" />
  271 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
  272 + <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" />
  273 + <option value="$PROJECT_DIR$/pages/index/index.js" />
  274 + <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
273 </list> 275 </list>
274 </option> 276 </option>
275 </component> 277 </component>
@@ -280,8 +282,8 @@ @@ -280,8 +282,8 @@
280 <sorting>DEFINITION_ORDER</sorting> 282 <sorting>DEFINITION_ORDER</sorting>
281 </component> 283 </component>
282 <component name="ProjectFrameBounds" extendedState="6"> 284 <component name="ProjectFrameBounds" extendedState="6">
283 - <option name="x" value="416" />  
284 - <option name="y" value="15" /> 285 + <option name="x" value="-258" />
  286 + <option name="y" value="16" />
285 <option name="width" value="1936" /> 287 <option name="width" value="1936" />
286 <option name="height" value="1047" /> 288 <option name="height" value="1047" />
287 </component> 289 </component>
@@ -312,6 +314,13 @@ @@ -312,6 +314,13 @@
312 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 314 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
313 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 315 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
314 <item name="pages" type="462c0819:PsiDirectoryNode" /> 316 <item name="pages" type="462c0819:PsiDirectoryNode" />
  317 + <item name="clock" type="462c0819:PsiDirectoryNode" />
  318 + <item name="punchAppeal" type="462c0819:PsiDirectoryNode" />
  319 + </path>
  320 + <path>
  321 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  322 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  323 + <item name="pages" type="462c0819:PsiDirectoryNode" />
315 <item name="index" type="462c0819:PsiDirectoryNode" /> 324 <item name="index" type="462c0819:PsiDirectoryNode" />
316 </path> 325 </path>
317 <path> 326 <path>
@@ -332,6 +341,13 @@ @@ -332,6 +341,13 @@
332 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 341 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
333 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 342 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
334 <item name="pages" type="462c0819:PsiDirectoryNode" /> 343 <item name="pages" type="462c0819:PsiDirectoryNode" />
  344 + <item name="index" type="462c0819:PsiDirectoryNode" />
  345 + <item name="go-appointment" type="462c0819:PsiDirectoryNode" />
  346 + </path>
  347 + <path>
  348 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  349 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  350 + <item name="pages" type="462c0819:PsiDirectoryNode" />
335 <item name="my" type="462c0819:PsiDirectoryNode" /> 351 <item name="my" type="462c0819:PsiDirectoryNode" />
336 </path> 352 </path>
337 <path> 353 <path>
@@ -463,7 +479,8 @@ @@ -463,7 +479,8 @@
463 <workItem from="1545354042642" duration="5649000" /> 479 <workItem from="1545354042642" duration="5649000" />
464 <workItem from="1545441360042" duration="4461000" /> 480 <workItem from="1545441360042" duration="4461000" />
465 <workItem from="1545627102606" duration="3505000" /> 481 <workItem from="1545627102606" duration="3505000" />
466 - <workItem from="1545700023575" duration="3152000" /> 482 + <workItem from="1545700023575" duration="5185000" />
  483 + <workItem from="1545726292000" duration="5146000" />
467 </task> 484 </task>
468 <task id="LOCAL-00001" summary="modal 模板"> 485 <task id="LOCAL-00001" summary="modal 模板">
469 <created>1542274356914</created> 486 <created>1542274356914</created>
@@ -549,17 +566,37 @@ @@ -549,17 +566,37 @@
549 <option name="project" value="LOCAL" /> 566 <option name="project" value="LOCAL" />
550 <updated>1545382588706</updated> 567 <updated>1545382588706</updated>
551 </task> 568 </task>
552 - <option name="localTasksCounter" value="13" /> 569 + <task id="LOCAL-00013" summary="修改预约记录样式，修改兑换picker点击范围">
  570 + <created>1545704797930</created>
  571 + <option name="number" value="00013" />
  572 + <option name="presentableId" value="LOCAL-00013" />
  573 + <option name="project" value="LOCAL" />
  574 + <updated>1545704797930</updated>
  575 + </task>
  576 + <task id="LOCAL-00014" summary="去掉测试数据">
  577 + <created>1545705005648</created>
  578 + <option name="number" value="00014" />
  579 + <option name="presentableId" value="LOCAL-00014" />
  580 + <option name="project" value="LOCAL" />
  581 + <updated>1545705005648</updated>
  582 + </task>
  583 + <task id="LOCAL-00015" summary="优化预约">
  584 + <created>1545734413573</created>
  585 + <option name="number" value="00015" />
  586 + <option name="presentableId" value="LOCAL-00015" />
  587 + <option name="project" value="LOCAL" />
  588 + <updated>1545734413573</updated>
  589 + </task>
  590 + <option name="localTasksCounter" value="16" />
553 <servers /> 591 <servers />
554 </component> 592 </component>
555 <component name="TimeTrackingManager"> 593 <component name="TimeTrackingManager">
556 - <option name="totallyTimeSpent" value="258960000" /> 594 + <option name="totallyTimeSpent" value="266139000" />
557 </component> 595 </component>
558 <component name="ToolWindowManager"> 596 <component name="ToolWindowManager">
559 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />  
560 - <editor active="true" /> 597 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
561 <layout> 598 <layout>
562 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" /> 599 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
563 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 600 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
564 <window_info id="Favorites" order="2" side_tool="true" /> 601 <window_info id="Favorites" order="2" side_tool="true" />
565 <window_info anchor="bottom" id="Message" order="0" /> 602 <window_info anchor="bottom" id="Message" order="0" />
@@ -572,7 +609,7 @@ @@ -572,7 +609,7 @@
572 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 609 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
573 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" /> 610 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
574 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" /> 611 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" />
575 - <window_info anchor="bottom" id="Version Control" order="10" weight="0.5759219" /> 612 + <window_info active="true" anchor="bottom" id="Version Control" order="10" visible="true" weight="0.5759219" />
576 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 613 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
577 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 614 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
578 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 615 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -623,7 +660,10 @@ @@ -623,7 +660,10 @@
623 <MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" /> 660 <MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
624 <MESSAGE value="添加默认图，测试用" /> 661 <MESSAGE value="添加默认图，测试用" />
625 <MESSAGE value="添加未购卡片" /> 662 <MESSAGE value="添加未购卡片" />
626 - <option name="LAST_COMMIT_MESSAGE" value="添加未购卡片" /> 663 + <MESSAGE value="修改预约记录样式，修改兑换picker点击范围" />
  664 + <MESSAGE value="去掉测试数据" />
  665 + <MESSAGE value="优化预约" />
  666 + <option name="LAST_COMMIT_MESSAGE" value="优化预约" />
627 </component> 667 </component>
628 <component name="editorHistoryManager"> 668 <component name="editorHistoryManager">
629 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss"> 669 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
@@ -633,13 +673,6 @@ @@ -633,13 +673,6 @@
633 </state> 673 </state>
634 </provider> 674 </provider>
635 </entry> 675 </entry>
636 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">  
637 - <provider selected="true" editor-type-id="text-editor">  
638 - <state relative-caret-position="270">  
639 - <caret line="143" column="11" selection-start-line="143" selection-start-column="1" selection-end-line="143" selection-end-column="11" />  
640 - </state>  
641 - </provider>  
642 - </entry>  
643 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.js"> 676 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.js">
644 <provider selected="true" editor-type-id="text-editor" /> 677 <provider selected="true" editor-type-id="text-editor" />
645 </entry> 678 </entry>
@@ -681,13 +714,6 @@ @@ -681,13 +714,6 @@
681 </state> 714 </state>
682 </provider> 715 </provider>
683 </entry> 716 </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"> 717 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
692 <provider selected="true" editor-type-id="text-editor"> 718 <provider selected="true" editor-type-id="text-editor">
693 <state relative-caret-position="212"> 719 <state relative-caret-position="212">
@@ -702,20 +728,6 @@ @@ -702,20 +728,6 @@
702 </state> 728 </state>
703 </provider> 729 </provider>
704 </entry> 730 </entry>
705 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">  
706 - <provider selected="true" editor-type-id="text-editor">  
707 - <state relative-caret-position="2244">  
708 - <caret line="102" column="57" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />  
709 - </state>  
710 - </provider>  
711 - </entry>  
712 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">  
713 - <provider selected="true" editor-type-id="text-editor">  
714 - <state relative-caret-position="-1731">  
715 - <caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />  
716 - </state>  
717 - </provider>  
718 - </entry>  
719 <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml"> 731 <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
720 <provider selected="true" editor-type-id="text-editor"> 732 <provider selected="true" editor-type-id="text-editor">
721 <state relative-caret-position="264"> 733 <state relative-caret-position="264">
@@ -723,13 +735,6 @@ @@ -723,13 +735,6 @@
723 </state> 735 </state>
724 </provider> 736 </provider>
725 </entry> 737 </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"> 738 <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
734 <provider selected="true" editor-type-id="text-editor"> 739 <provider selected="true" editor-type-id="text-editor">
735 <state relative-caret-position="478"> 740 <state relative-caret-position="478">
@@ -744,13 +749,6 @@ @@ -744,13 +749,6 @@
744 </state> 749 </state>
745 </provider> 750 </provider>
746 </entry> 751 </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"> 752 <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
755 <provider selected="true" editor-type-id="text-editor"> 753 <provider selected="true" editor-type-id="text-editor">
756 <state relative-caret-position="220"> 754 <state relative-caret-position="220">
@@ -849,13 +847,6 @@ @@ -849,13 +847,6 @@
849 </state> 847 </state>
850 </provider> 848 </provider>
851 </entry> 849 </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"> 850 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
860 <provider selected="true" editor-type-id="text-editor"> 851 <provider selected="true" editor-type-id="text-editor">
861 <state relative-caret-position="418"> 852 <state relative-caret-position="418">
@@ -881,10 +872,6 @@ @@ -881,10 +872,6 @@
881 <provider selected="true" editor-type-id="text-editor"> 872 <provider selected="true" editor-type-id="text-editor">
882 <state relative-caret-position="748"> 873 <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" /> 874 <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> 875 </state>
889 </provider> 876 </provider>
890 </entry> 877 </entry>
@@ -902,16 +889,6 @@ @@ -902,16 +889,6 @@
902 </state> 889 </state>
903 </provider> 890 </provider>
904 </entry> 891 </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"> 892 <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
916 <provider selected="true" editor-type-id="text-editor"> 893 <provider selected="true" editor-type-id="text-editor">
917 <state relative-caret-position="7942"> 894 <state relative-caret-position="7942">
@@ -929,41 +906,48 @@ @@ -929,41 +906,48 @@
929 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml"> 906 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
930 <provider selected="true" editor-type-id="text-editor" /> 907 <provider selected="true" editor-type-id="text-editor" />
931 </entry> 908 </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"> 909 <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
940 <provider selected="true" editor-type-id="text-editor"> 910 <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" /> 911 + <state relative-caret-position="2332">
  912 + <caret line="106" column="11" selection-start-line="106" selection-start-column="11" selection-end-line="106" selection-end-column="11" />
943 </state> 913 </state>
944 </provider> 914 </provider>
945 </entry> 915 </entry>
946 <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js"> 916 <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
947 <provider selected="true" editor-type-id="text-editor"> 917 <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" /> 918 + <state relative-caret-position="1474">
  919 + <caret line="67" column="32" selection-start-line="67" selection-start-column="32" selection-end-line="67" selection-end-column="32" />
950 </state> 920 </state>
951 </provider> 921 </provider>
952 </entry> 922 </entry>
953 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml"> 923 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
954 <provider selected="true" editor-type-id="text-editor"> 924 <provider selected="true" editor-type-id="text-editor">
955 - <state relative-caret-position="319"> 925 + <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" /> 926 <caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
957 </state> 927 </state>
958 </provider> 928 </provider>
959 </entry> 929 </entry>
960 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss"> 930 <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
961 <provider selected="true" editor-type-id="text-editor"> 931 <provider selected="true" editor-type-id="text-editor">
962 - <state relative-caret-position="800"> 932 + <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" /> 933 <caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
964 </state> 934 </state>
965 </provider> 935 </provider>
966 </entry> 936 </entry>
  937 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
  938 + <provider selected="true" editor-type-id="text-editor">
  939 + <state relative-caret-position="968">
  940 + <caret line="44" column="1" lean-forward="true" selection-start-line="44" selection-start-column="1" selection-end-line="44" selection-end-column="1" />
  941 + </state>
  942 + </provider>
  943 + </entry>
  944 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
  945 + <provider selected="true" editor-type-id="text-editor">
  946 + <state relative-caret-position="990">
  947 + <caret line="45" column="71" selection-start-line="45" selection-start-column="71" selection-end-line="45" selection-end-column="71" />
  948 + </state>
  949 + </provider>
  950 + </entry>
967 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml"> 951 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
968 <provider selected="true" editor-type-id="text-editor"> 952 <provider selected="true" editor-type-id="text-editor">
969 <state relative-caret-position="242"> 953 <state relative-caret-position="242">
@@ -971,10 +955,62 @@ @@ -971,10 +955,62 @@
971 </state> 955 </state>
972 </provider> 956 </provider>
973 </entry> 957 </entry>
974 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss"> 958 + <entry file="file://$PROJECT_DIR$/app.js">
975 <provider selected="true" editor-type-id="text-editor"> 959 <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" /> 960 + <state relative-caret-position="3454">
  961 + <caret line="158" column="17" selection-start-line="158" selection-start-column="17" selection-end-line="158" selection-end-column="17" />
  962 + </state>
  963 + </provider>
  964 + </entry>
  965 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
  966 + <provider selected="true" editor-type-id="text-editor">
  967 + <state relative-caret-position="352">
  968 + <caret line="25" column="99" selection-start-line="25" selection-start-column="88" selection-end-line="25" selection-end-column="99" />
  969 + </state>
  970 + </provider>
  971 + </entry>
  972 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
  973 + <provider selected="true" editor-type-id="text-editor">
  974 + <state relative-caret-position="564">
  975 + <caret line="60" column="49" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="49" />
  976 + </state>
  977 + </provider>
  978 + </entry>
  979 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
  980 + <provider selected="true" editor-type-id="text-editor">
  981 + <state relative-caret-position="345">
  982 + <caret line="67" column="59" lean-forward="true" selection-start-line="67" selection-start-column="59" selection-end-line="67" selection-end-column="59" />
  983 + <folding>
  984 + <element signature="n#!!doc" expanded="true" />
  985 + </folding>
  986 + </state>
  987 + </provider>
  988 + </entry>
  989 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
  990 + <provider selected="true" editor-type-id="text-editor">
  991 + <state relative-caret-position="3072">
  992 + <caret line="246" column="40" lean-forward="true" selection-start-line="246" selection-start-column="40" selection-end-line="246" selection-end-column="40" />
  993 + </state>
  994 + </provider>
  995 + </entry>
  996 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
  997 + <provider selected="true" editor-type-id="text-editor">
  998 + <state relative-caret-position="528">
  999 + <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" />
  1000 + </state>
  1001 + </provider>
  1002 + </entry>
  1003 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
  1004 + <provider selected="true" editor-type-id="text-editor">
  1005 + <state relative-caret-position="528">
  1006 + <caret line="39" column="29" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="29" />
  1007 + </state>
  1008 + </provider>
  1009 + </entry>
  1010 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
  1011 + <provider selected="true" editor-type-id="text-editor">
  1012 + <state relative-caret-position="102">
  1013 + <caret line="89" column="16" lean-forward="true" selection-start-line="89" selection-start-column="16" selection-end-line="89" selection-end-column="16" />
978 </state> 1014 </state>
979 </provider> 1015 </provider>
980 </entry> 1016 </entry>
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <!--</view>--> 43 <!--</view>-->
44 <checkbox-group class="check-box" bindchange="chooseChildren"> 44 <checkbox-group class="check-box" bindchange="chooseChildren">
45 <label class="checkbox" wx:for="{{student_list}}" wx:for-item="i" wx:key="index"> 45 <label class="checkbox" wx:for="{{student_list}}" wx:for-item="i" wx:key="index">
46 - <view class="name {{i.checked?'change-color':''}}">{{i.name}}{{i.checked}}</view> 46 + <view class="name {{i.checked?'change-color':''}}">{{i.name}}</view>
47 <checkbox value="{{index}}" checked="{{i.checked}}" id="{{i.id}}" name="student_id" class="checkbox"/> 47 <checkbox value="{{index}}" checked="{{i.checked}}" id="{{i.id}}" name="student_id" class="checkbox"/>
48 </label> 48 </label>
49 </checkbox-group> 49 </checkbox-group>
@@ -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);
@@ -275,6 +195,7 @@ Page({ @@ -275,6 +195,7 @@ Page({
275 this.setData({ 195 this.setData({
276 areaTest: res.list, 196 areaTest: res.list,
277 student_num: res.student_num, 197 student_num: res.student_num,
  198 + current_test_id: res.list[0].lab_list[0].id,
278 // current_test_id: res.list[0].lab_list ? res.list[0].lab_list[0].id : '',//默认实验室id 199 // current_test_id: res.list[0].lab_list ? res.list[0].lab_list[0].id : '',//默认实验室id
279 // current_session_id: res.list[0].lab_list ? res.list[0].lab_list[0].session_list[0].id : '',//默认场次id 200 // current_session_id: res.list[0].lab_list ? res.list[0].lab_list[0].session_list[0].id : '',//默认场次id
280 description: res.list[0].lab_list ? res.list[0].lab_list[0].description : '',//默认显示第一个实验室的描述 201 description: res.list[0].lab_list ? res.list[0].lab_list[0].description : '',//默认显示第一个实验室的描述
@@ -289,7 +210,7 @@ Page({ @@ -289,7 +210,7 @@ Page({
289 */ 210 */
290 onLoad: function (options) { 211 onLoad: function (options) {
291 const self = this; 212 const self = this;
292 - console.log('load',options); 213 + console.log('load-experiment_id',options);
293 self.setData({experiment_id: +options.experiment_id}); 214 self.setData({experiment_id: +options.experiment_id});
294 215
295 // this.data.areaTest.forEach((v, i) => { 216 // this.data.areaTest.forEach((v, i) => {
@@ -309,11 +230,20 @@ Page({ @@ -309,11 +230,20 @@ Page({
309 }, 230 },
310 getData() { 231 getData() {
311 const self = this; 232 const self = this;
312 - if (wx.getStorageSync('city')) { 233 + if ((wx.getStorageSync('city') === wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
313 const city = wx.getStorageSync('city'); 234 const city = wx.getStorageSync('city');
  235 + // console.log('city',city);
314 self.getChooseSession(city); 236 self.getChooseSession(city);
  237 + // console.log(self.data.currentCity);
315 self.setData({currentCity: city}) 238 self.setData({currentCity: city})
316 - } else { 239 + // console.log(self.data.currentCity);
  240 +
  241 + }else if((wx.getStorageSync('city') !== wx.getStorageSync('choose-city')) && wx.getStorageSync('choose-city') !=='') {
  242 + const city = wx.getStorageSync('choose-city');
  243 + self.getChooseSession(city);
  244 + self.setData({currentCity: city})
  245 + } else if(wx.getStorageSync('city') === ''){
  246 + // console.log('aaa');
317 const city = '北京市'; 247 const city = '北京市';
318 self.getChooseSession(city); 248 self.getChooseSession(city);
319 } 249 }
@@ -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 && current_test_id === item.id}}"
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 //获取轮播图