miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 ff2648f837800f82b0844733cd86e145041fe72f 1 个父辈 5c654f0d

添加默认图，测试用

内嵌 并排对比
正在显示 7 个修改的文件 包含 200 行增加 和 267 行删除
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="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑">
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/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/pages/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" />
7 - <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" afterDir="false" />  
8 - <change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" afterDir="false" />  
9 - <change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" afterDir="false" />  
10 - <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/clock/clock.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxss" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" afterDir="false" />
11 <change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" /> 9 <change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
12 - <change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss" afterDir="false" />  
14 - <change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js" afterDir="false" />  
15 - <change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" afterDir="false" />  
16 - <change beforePath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" afterDir="false" />  
17 - <change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" afterDir="false" />  
18 - <change beforePath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" afterDir="false" />  
19 - <change beforePath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" afterDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxss" afterDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" afterDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/pages/my/myCard/myCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myCard/myCard.js" afterDir="false" />  
23 - <change beforePath="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" afterDir="false" />  
24 - <change beforePath="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" afterDir="false" />  
25 - <change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" afterDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" afterDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" afterDir="false" />  
29 - <change beforePath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" afterDir="false" /> 10 + <change beforePath="$PROJECT_DIR$/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxml" afterDir="false" />
30 </list> 11 </list>
31 <ignored path="$PROJECT_DIR$/.tmp/" /> 12 <ignored path="$PROJECT_DIR$/.tmp/" />
32 <ignored path="$PROJECT_DIR$/temp/" /> 13 <ignored path="$PROJECT_DIR$/temp/" />
@@ -41,48 +22,48 @@ @@ -41,48 +22,48 @@
41 <session id="-381596063"> 22 <session id="-381596063">
42 <usages-collector id="statistics.lifecycle.project"> 23 <usages-collector id="statistics.lifecycle.project">
43 <counts> 24 <counts>
44 - <entry key="project.closed" value="18" /> 25 + <entry key="project.closed" value="20" />
45 <entry key="project.open.time.0" value="6" /> 26 <entry key="project.open.time.0" value="6" />
46 <entry key="project.open.time.1" value="8" /> 27 <entry key="project.open.time.1" value="8" />
47 <entry key="project.open.time.10" value="1" /> 28 <entry key="project.open.time.10" value="1" />
48 - <entry key="project.open.time.2" value="2" /> 29 + <entry key="project.open.time.2" value="3" />
49 <entry key="project.open.time.8" value="2" /> 30 <entry key="project.open.time.8" value="2" />
50 - <entry key="project.open.time.9" value="1" />  
51 - <entry key="project.opened" value="20" /> 31 + <entry key="project.open.time.9" value="2" />
  32 + <entry key="project.opened" value="22" />
52 </counts> 33 </counts>
53 </usages-collector> 34 </usages-collector>
54 <usages-collector id="statistics.file.extensions.open"> 35 <usages-collector id="statistics.file.extensions.open">
55 <counts> 36 <counts>
56 - <entry key="js" value="163" /> 37 + <entry key="js" value="169" />
57 <entry key="json" value="31" /> 38 <entry key="json" value="31" />
58 - <entry key="wxml" value="129" /> 39 + <entry key="wxml" value="133" />
59 <entry key="wxss" value="51" /> 40 <entry key="wxss" value="51" />
60 </counts> 41 </counts>
61 </usages-collector> 42 </usages-collector>
62 <usages-collector id="statistics.file.types.open"> 43 <usages-collector id="statistics.file.types.open">
63 <counts> 44 <counts>
64 <entry key="CSS" value="51" /> 45 <entry key="CSS" value="51" />
65 - <entry key="HTML" value="129" /> 46 + <entry key="HTML" value="133" />
66 <entry key="JSON" value="31" /> 47 <entry key="JSON" value="31" />
67 - <entry key="JavaScript" value="163" /> 48 + <entry key="JavaScript" value="169" />
68 </counts> 49 </counts>
69 </usages-collector> 50 </usages-collector>
70 <usages-collector id="statistics.file.extensions.edit"> 51 <usages-collector id="statistics.file.extensions.edit">
71 <counts> 52 <counts>
72 - <entry key="js" value="15129" /> 53 + <entry key="js" value="15197" />
73 <entry key="json" value="158" /> 54 <entry key="json" value="158" />
74 - <entry key="txt" value="288" />  
75 - <entry key="wxml" value="3443" /> 55 + <entry key="txt" value="436" />
  56 + <entry key="wxml" value="3633" />
76 <entry key="wxss" value="1590" /> 57 <entry key="wxss" value="1590" />
77 </counts> 58 </counts>
78 </usages-collector> 59 </usages-collector>
79 <usages-collector id="statistics.file.types.edit"> 60 <usages-collector id="statistics.file.types.edit">
80 <counts> 61 <counts>
81 <entry key="CSS" value="1590" /> 62 <entry key="CSS" value="1590" />
82 - <entry key="HTML" value="3443" /> 63 + <entry key="HTML" value="3633" />
83 <entry key="JSON" value="158" /> 64 <entry key="JSON" value="158" />
84 - <entry key="JavaScript" value="15129" />  
85 - <entry key="PLAIN_TEXT" value="288" /> 65 + <entry key="JavaScript" value="15197" />
  66 + <entry key="PLAIN_TEXT" value="436" />
86 </counts> 67 </counts>
87 </usages-collector> 68 </usages-collector>
88 <usages-collector id="statistics.vcs.git.usages"> 69 <usages-collector id="statistics.vcs.git.usages">
@@ -94,102 +75,107 @@ @@ -94,102 +75,107 @@
94 </component> 75 </component>
95 <component name="FileEditorManager"> 76 <component name="FileEditorManager">
96 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
97 - <file pinned="false" current-in-tab="true"> 78 + <file pinned="false" current-in-tab="false">
98 <entry file="file://$PROJECT_DIR$/pages/clock/clock.js"> 79 <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
99 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
100 - <state relative-caret-position="773">  
101 - <caret line="159" column="10" lean-forward="true" selection-start-line="159" selection-start-column="10" selection-end-line="159" selection-end-column="10" /> 81 + <state relative-caret-position="2530">
  82 + <caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
102 <folding> 83 <folding>
103 <element signature="e#152#1691#0" /> 84 <element signature="e#152#1691#0" />
104 - <element signature="e#4857#8107#0" />  
105 </folding> 85 </folding>
106 </state> 86 </state>
107 </provider> 87 </provider>
108 </entry> 88 </entry>
109 </file> 89 </file>
110 <file pinned="false" current-in-tab="false"> 90 <file pinned="false" current-in-tab="false">
111 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">  
112 - <provider selected="true" editor-type-id="text-editor" />  
113 - </entry>  
114 - </file>  
115 - <file pinned="false" current-in-tab="false">  
116 - <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml"> 91 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
117 <provider selected="true" editor-type-id="text-editor"> 92 <provider selected="true" editor-type-id="text-editor">
118 - <state relative-caret-position="594">  
119 - <caret line="27" column="13" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="13" /> 93 + <state relative-caret-position="792">
  94 + <caret line="36" column="50" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="50" />
120 </state> 95 </state>
121 </provider> 96 </provider>
122 </entry> 97 </entry>
123 </file> 98 </file>
124 <file pinned="false" current-in-tab="false"> 99 <file pinned="false" current-in-tab="false">
125 - <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js"> 100 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
126 <provider selected="true" editor-type-id="text-editor"> 101 <provider selected="true" editor-type-id="text-editor">
127 - <state relative-caret-position="74">  
128 - <caret line="63" column="34" lean-forward="true" selection-start-line="63" selection-start-column="34" selection-end-line="63" selection-end-column="34" /> 102 + <state relative-caret-position="3564">
  103 + <caret line="162" column="79" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="79" />
129 </state> 104 </state>
130 </provider> 105 </provider>
131 </entry> 106 </entry>
132 </file> 107 </file>
133 <file pinned="false" current-in-tab="false"> 108 <file pinned="false" current-in-tab="false">
134 - <entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.wxml"> 109 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
135 <provider selected="true" editor-type-id="text-editor"> 110 <provider selected="true" editor-type-id="text-editor">
136 - <state relative-caret-position="1232">  
137 - <caret line="92" column="49" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="49" /> 111 + <state relative-caret-position="1694">
  112 + <caret line="77" column="60" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="60" />
138 </state> 113 </state>
139 </provider> 114 </provider>
140 </entry> 115 </entry>
141 </file> 116 </file>
142 - <file pinned="false" current-in-tab="false">  
143 - <entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.js"> 117 + <file pinned="false" current-in-tab="true">
  118 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
144 <provider selected="true" editor-type-id="text-editor"> 119 <provider selected="true" editor-type-id="text-editor">
145 - <state relative-caret-position="674">  
146 - <caret line="62" column="34" lean-forward="true" selection-start-line="62" selection-start-column="34" selection-end-line="62" selection-end-column="34" /> 120 + <state relative-caret-position="418">
  121 + <caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
  122 + <folding>
  123 + <element signature="n#style#0;n#view#0;n#view#0;n#!!top" expanded="true" />
  124 + <element signature="n#style#0;n#view#1;n#view#0;n#!!top" expanded="true" />
  125 + <element signature="n#style#0;n#image#0;n#view#1;n#view#0;n#!!top" expanded="true" />
  126 + </folding>
147 </state> 127 </state>
148 </provider> 128 </provider>
149 </entry> 129 </entry>
150 </file> 130 </file>
151 <file pinned="false" current-in-tab="false"> 131 <file pinned="false" current-in-tab="false">
152 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml"> 132 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
153 <provider selected="true" editor-type-id="text-editor"> 133 <provider selected="true" editor-type-id="text-editor">
154 - <state relative-caret-position="509">  
155 - <caret line="134" column="31" lean-forward="true" selection-start-line="134" selection-start-column="31" selection-end-line="134" selection-end-column="31" /> 134 + <state relative-caret-position="22">
  135 + <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
156 </state> 136 </state>
157 </provider> 137 </provider>
158 </entry> 138 </entry>
159 </file> 139 </file>
160 <file pinned="false" current-in-tab="false"> 140 <file pinned="false" current-in-tab="false">
161 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml"> 141 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
162 <provider selected="true" editor-type-id="text-editor"> 142 <provider selected="true" editor-type-id="text-editor">
163 - <state relative-caret-position="740">  
164 - <caret line="57" column="63" lean-forward="true" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="63" /> 143 + <state relative-caret-position="264">
  144 + <caret line="13" column="96" selection-start-line="13" selection-start-column="96" selection-end-line="13" selection-end-column="96" />
  145 + <folding>
  146 + <element signature="n#!!doc" expanded="true" />
  147 + </folding>
165 </state> 148 </state>
166 </provider> 149 </provider>
167 </entry> 150 </entry>
168 </file> 151 </file>
169 <file pinned="false" current-in-tab="false"> 152 <file pinned="false" current-in-tab="false">
170 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js"> 153 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
171 <provider selected="true" editor-type-id="text-editor"> 154 <provider selected="true" editor-type-id="text-editor">
172 - <state relative-caret-position="-28">  
173 - <caret line="89" column="5" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" /> 155 + <state relative-caret-position="7942">
  156 + <caret line="361" column="28" lean-forward="true" selection-start-line="361" selection-start-column="28" selection-end-line="361" selection-end-column="28" />
174 </state> 157 </state>
175 </provider> 158 </provider>
176 </entry> 159 </entry>
177 </file> 160 </file>
178 <file pinned="false" current-in-tab="false"> 161 <file pinned="false" current-in-tab="false">
179 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js"> 162 + <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
180 <provider selected="true" editor-type-id="text-editor"> 163 <provider selected="true" editor-type-id="text-editor">
181 - <state relative-caret-position="495">  
182 - <caret line="170" column="49" selection-start-line="170" selection-start-column="36" selection-end-line="170" selection-end-column="49" /> 164 + <state relative-caret-position="1672">
  165 + <caret line="76" column="28" selection-start-line="76" selection-start-column="28" selection-end-line="76" selection-end-column="28" />
183 </state> 166 </state>
184 </provider> 167 </provider>
185 </entry> 168 </entry>
186 </file> 169 </file>
  170 + <file pinned="false" current-in-tab="false">
  171 + <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
  172 + <provider selected="true" editor-type-id="text-editor" />
  173 + </entry>
  174 + </file>
187 </leaf> 175 </leaf>
188 </component> 176 </component>
189 <component name="FindInProjectRecents"> 177 <component name="FindInProjectRecents">
190 <findStrings> 178 <findStrings>
191 - <find>getAppointmentList</find>  
192 - <find>modal</find>  
193 <find>refreshBuyState</find> 179 <find>refreshBuyState</find>
194 <find>getAppointmentInfo</find> 180 <find>getAppointmentInfo</find>
195 <find>student_id</find> 181 <find>student_id</find>
@@ -213,12 +199,17 @@ @@ -213,12 +199,17 @@
213 <find>from_appointment</find> 199 <find>from_appointment</find>
214 <find>page_num</find> 200 <find>page_num</find>
215 <find>id</find> 201 <find>id</find>
216 - <find>recordList</find>  
217 <find>打卡</find> 202 <find>打卡</find>
218 <find>test</find> 203 <find>test</find>
219 <find>postPosition</find> 204 <find>postPosition</find>
220 <find>getExperiment</find> 205 <find>getExperiment</find>
  206 + <find>recordList</find>
  207 + <find>page_number</find>
  208 + <find>delStudent</find>
221 </findStrings> 209 </findStrings>
  210 + <dirStrings>
  211 + <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
  212 + </dirStrings>
222 </component> 213 </component>
223 <component name="Git.Settings"> 214 <component name="Git.Settings">
224 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 215 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -239,7 +230,6 @@ @@ -239,7 +230,6 @@
239 <component name="IdeDocumentHistory"> 230 <component name="IdeDocumentHistory">
240 <option name="CHANGED_PATHS"> 231 <option name="CHANGED_PATHS">
241 <list> 232 <list>
242 - <option value="$PROJECT_DIR$/pages/my/charge/charge.wxml" />  
243 <option value="$PROJECT_DIR$/pages/my/charge/charge.js" /> 233 <option value="$PROJECT_DIR$/pages/my/charge/charge.js" />
244 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" /> 234 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
245 <option value="$PROJECT_DIR$/app.wxss" /> 235 <option value="$PROJECT_DIR$/app.wxss" />
@@ -261,7 +251,6 @@ @@ -261,7 +251,6 @@
261 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" /> 251 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
262 <option value="$PROJECT_DIR$/app.json" /> 252 <option value="$PROJECT_DIR$/app.json" />
263 <option value="$PROJECT_DIR$/pages/start/start.js" /> 253 <option value="$PROJECT_DIR$/pages/start/start.js" />
264 - <option value="$PROJECT_DIR$/pages/index/index.wxml" />  
265 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" /> 254 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
266 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" /> 255 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" />
267 <option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" /> 256 <option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" />
@@ -269,7 +258,6 @@ @@ -269,7 +258,6 @@
269 <option value="$PROJECT_DIR$/pages/index/index.wxss" /> 258 <option value="$PROJECT_DIR$/pages/index/index.wxss" />
270 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" /> 259 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
271 <option value="$PROJECT_DIR$/pages/my/my.wxss" /> 260 <option value="$PROJECT_DIR$/pages/my/my.wxss" />
272 - <option value="$PROJECT_DIR$/pages/index/index.js" />  
273 <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" /> 261 <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
274 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" /> 262 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
275 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" /> 263 <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
@@ -289,7 +277,10 @@ @@ -289,7 +277,10 @@
289 <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" /> 277 <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" />
290 <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" /> 278 <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" />
291 <option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" /> 279 <option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" />
  280 + <option value="$PROJECT_DIR$/pages/index/index.js" />
  281 + <option value="$PROJECT_DIR$/pages/index/index.wxml" />
292 <option value="$PROJECT_DIR$/pages/clock/clock.js" /> 282 <option value="$PROJECT_DIR$/pages/clock/clock.js" />
  283 + <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
293 </list> 284 </list>
294 </option> 285 </option>
295 </component> 286 </component>
@@ -332,27 +323,6 @@ @@ -332,27 +323,6 @@
332 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 323 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
333 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 324 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
334 <item name="pages" type="462c0819:PsiDirectoryNode" /> 325 <item name="pages" type="462c0819:PsiDirectoryNode" />
335 - <item name="clock" type="462c0819:PsiDirectoryNode" />  
336 - <item name="punchAppeal" type="462c0819:PsiDirectoryNode" />  
337 - </path>  
338 - <path>  
339 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
340 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
341 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
342 - <item name="clock" type="462c0819:PsiDirectoryNode" />  
343 - <item name="punchAppealDetail" 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" />  
349 - <item name="clock" type="462c0819:PsiDirectoryNode" />  
350 - <item name="punchAppealDetail2" type="462c0819:PsiDirectoryNode" />  
351 - </path>  
352 - <path>  
353 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
354 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
355 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
356 <item name="index" type="462c0819:PsiDirectoryNode" /> 326 <item name="index" type="462c0819:PsiDirectoryNode" />
357 </path> 327 </path>
358 <path> 328 <path>
@@ -373,22 +343,7 @@ @@ -373,22 +343,7 @@
373 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 343 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
374 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 344 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
375 <item name="pages" type="462c0819:PsiDirectoryNode" /> 345 <item name="pages" type="462c0819:PsiDirectoryNode" />
376 - <item name="index" type="462c0819:PsiDirectoryNode" />  
377 - <item name="confirm-appointment-info" type="462c0819:PsiDirectoryNode" />  
378 - <item name="add-student" type="462c0819:PsiDirectoryNode" />  
379 - </path>  
380 - <path>  
381 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
382 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
383 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
384 - <item name="my" type="462c0819:PsiDirectoryNode" />  
385 - </path>  
386 - <path>  
387 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
388 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
389 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
390 <item name="my" type="462c0819:PsiDirectoryNode" /> 346 <item name="my" type="462c0819:PsiDirectoryNode" />
391 - <item name="appointmentRecord" type="462c0819:PsiDirectoryNode" />  
392 </path> 347 </path>
393 <path> 348 <path>
394 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 349 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
@@ -409,35 +364,14 @@ @@ -409,35 +364,14 @@
409 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 364 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
410 <item name="pages" type="462c0819:PsiDirectoryNode" /> 365 <item name="pages" type="462c0819:PsiDirectoryNode" />
411 <item name="my" type="462c0819:PsiDirectoryNode" /> 366 <item name="my" type="462c0819:PsiDirectoryNode" />
412 - <item name="groupBuyDetail" type="462c0819:PsiDirectoryNode" /> 367 + <item name="myProfile" type="462c0819:PsiDirectoryNode" />
413 </path> 368 </path>
414 <path> 369 <path>
415 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 370 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
416 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 371 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
417 <item name="pages" type="462c0819:PsiDirectoryNode" /> 372 <item name="pages" type="462c0819:PsiDirectoryNode" />
418 <item name="my" type="462c0819:PsiDirectoryNode" /> 373 <item name="my" type="462c0819:PsiDirectoryNode" />
419 - <item name="myCard" type="462c0819:PsiDirectoryNode" />  
420 - </path>  
421 - <path>  
422 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
423 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
424 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
425 - <item name="my" type="462c0819:PsiDirectoryNode" />  
426 - <item name="order-detail" type="462c0819:PsiDirectoryNode" />  
427 - </path>  
428 - <path>  
429 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
430 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
431 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
432 - <item name="my" type="462c0819:PsiDirectoryNode" />  
433 - <item name="shareGroupBuy" type="462c0819:PsiDirectoryNode" />  
434 - </path>  
435 - <path>  
436 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
437 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
438 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
439 - <item name="my" type="462c0819:PsiDirectoryNode" />  
440 - <item name="takeGroupBuy" type="462c0819:PsiDirectoryNode" /> 374 + <item name="protocol" type="462c0819:PsiDirectoryNode" />
441 </path> 375 </path>
442 <path> 376 <path>
443 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 377 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
@@ -507,7 +441,9 @@ @@ -507,7 +441,9 @@
507 <workItem from="1544751555564" duration="3866000" /> 441 <workItem from="1544751555564" duration="3866000" />
508 <workItem from="1545014617044" duration="13676000" /> 442 <workItem from="1545014617044" duration="13676000" />
509 <workItem from="1545095024314" duration="3201000" /> 443 <workItem from="1545095024314" duration="3201000" />
510 - <workItem from="1545181336636" duration="25141000" /> 444 + <workItem from="1545181336636" duration="27359000" />
  445 + <workItem from="1545267535141" duration="7730000" />
  446 + <workItem from="1545354042642" duration="610000" />
511 </task> 447 </task>
512 <task id="LOCAL-00001" summary="modal 模板"> 448 <task id="LOCAL-00001" summary="modal 模板">
513 <created>1542274356914</created> 449 <created>1542274356914</created>
@@ -572,11 +508,18 @@ @@ -572,11 +508,18 @@
572 <option name="project" value="LOCAL" /> 508 <option name="project" value="LOCAL" />
573 <updated>1545025106365</updated> 509 <updated>1545025106365</updated>
574 </task> 510 </task>
575 - <option name="localTasksCounter" value="10" /> 511 + <task id="LOCAL-00010" summary="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑">
  512 + <created>1545209715916</created>
  513 + <option name="number" value="00010" />
  514 + <option name="presentableId" value="LOCAL-00010" />
  515 + <option name="project" value="LOCAL" />
  516 + <updated>1545209715916</updated>
  517 + </task>
  518 + <option name="localTasksCounter" value="11" />
576 <servers /> 519 <servers />
577 </component> 520 </component>
578 <component name="TimeTrackingManager"> 521 <component name="TimeTrackingManager">
579 - <option name="totallyTimeSpent" value="232245000" /> 522 + <option name="totallyTimeSpent" value="242803000" />
580 </component> 523 </component>
581 <component name="ToolWindowManager"> 524 <component name="ToolWindowManager">
582 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 525 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -595,7 +538,7 @@ @@ -595,7 +538,7 @@
595 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 538 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
596 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" /> 539 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
597 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" /> 540 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" />
598 - <window_info anchor="bottom" id="Version Control" order="10" weight="0.5791757" /> 541 + <window_info anchor="bottom" id="Version Control" order="10" weight="0.5780911" />
599 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 542 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
600 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 543 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
601 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 544 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -643,37 +586,10 @@ @@ -643,37 +586,10 @@
643 <MESSAGE value="预约详情页接口，删除学员，添加formid" /> 586 <MESSAGE value="预约详情页接口，删除学员，添加formid" />
644 <MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" /> 587 <MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
645 <MESSAGE value="申诉详情，二次申诉" /> 588 <MESSAGE value="申诉详情，二次申诉" />
646 - <option name="LAST_COMMIT_MESSAGE" value="申诉详情，二次申诉" /> 589 + <MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
  590 + <option name="LAST_COMMIT_MESSAGE" value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
647 </component> 591 </component>
648 <component name="editorHistoryManager"> 592 <component name="editorHistoryManager">
649 - <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">  
650 - <provider selected="true" editor-type-id="text-editor">  
651 - <state relative-caret-position="1254">  
652 - <caret line="57" column="27" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="27" />  
653 - </state>  
654 - </provider>  
655 - </entry>  
656 - <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">  
657 - <provider selected="true" editor-type-id="text-editor">  
658 - <state relative-caret-position="594">  
659 - <caret line="27" column="51" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />  
660 - </state>  
661 - </provider>  
662 - </entry>  
663 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">  
664 - <provider selected="true" editor-type-id="text-editor">  
665 - <state relative-caret-position="352">  
666 - <caret line="16" column="6" lean-forward="true" selection-start-line="16" selection-start-column="6" selection-end-line="17" selection-end-column="67" />  
667 - </state>  
668 - </provider>  
669 - </entry>  
670 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">  
671 - <provider selected="true" editor-type-id="text-editor">  
672 - <state relative-caret-position="22">  
673 - <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />  
674 - </state>  
675 - </provider>  
676 - </entry>  
677 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss"> 593 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
678 <provider selected="true" editor-type-id="text-editor"> 594 <provider selected="true" editor-type-id="text-editor">
679 <state relative-caret-position="440"> 595 <state relative-caret-position="440">
@@ -739,9 +655,6 @@ @@ -739,9 +655,6 @@
739 <provider selected="true" editor-type-id="text-editor"> 655 <provider selected="true" editor-type-id="text-editor">
740 <state relative-caret-position="374"> 656 <state relative-caret-position="374">
741 <caret line="17" column="63" lean-forward="true" selection-start-line="17" selection-start-column="63" selection-end-line="17" selection-end-column="63" /> 657 <caret line="17" column="63" lean-forward="true" selection-start-line="17" selection-start-column="63" selection-end-line="17" selection-end-column="63" />
742 - <folding>  
743 - <element signature="n#style#0;n#view#0;n#!!top" expanded="true" />  
744 - </folding>  
745 </state> 658 </state>
746 </provider> 659 </provider>
747 </entry> 660 </entry>
@@ -752,35 +665,10 @@ @@ -752,35 +665,10 @@
752 </state> 665 </state>
753 </provider> 666 </provider>
754 </entry> 667 </entry>
755 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">  
756 - <provider selected="true" editor-type-id="text-editor">  
757 - <state relative-caret-position="176">  
758 - <caret line="8" column="60" lean-forward="true" selection-start-line="8" selection-start-column="60" selection-end-line="8" selection-end-column="60" />  
759 - </state>  
760 - </provider>  
761 - </entry>  
762 <entry file="file://$PROJECT_DIR$/app.js"> 668 <entry file="file://$PROJECT_DIR$/app.js">
763 <provider selected="true" editor-type-id="text-editor"> 669 <provider selected="true" editor-type-id="text-editor">
764 <state relative-caret-position="411"> 670 <state relative-caret-position="411">
765 <caret line="137" column="47" selection-start-line="137" selection-start-column="47" selection-end-line="137" selection-end-column="47" /> 671 <caret line="137" column="47" selection-start-line="137" selection-start-column="47" selection-end-line="137" selection-end-column="47" />
766 - <folding>  
767 - <element signature="e#76#1092#0" />  
768 - <element signature="e#4307#4566#0" />  
769 - <element signature="e#5118#5452#0" />  
770 - <element signature="e#5495#5588#0" />  
771 - <element signature="e#5610#5695#0" />  
772 - </folding>  
773 - </state>  
774 - </provider>  
775 - </entry>  
776 - <entry file="file://$PROJECT_DIR$/pages/index/index.js">  
777 - <provider selected="true" editor-type-id="text-editor">  
778 - <state relative-caret-position="157">  
779 - <caret line="79" column="40" lean-forward="true" selection-start-line="79" selection-start-column="40" selection-end-line="79" selection-end-column="40" />  
780 - <folding>  
781 - <element signature="n#!!doc" expanded="true" />  
782 - <element signature="e#3441#6499#0" />  
783 - </folding>  
784 </state> 672 </state>
785 </provider> 673 </provider>
786 </entry> 674 </entry>
@@ -791,13 +679,6 @@ @@ -791,13 +679,6 @@
791 </state> 679 </state>
792 </provider> 680 </provider>
793 </entry> 681 </entry>
794 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">  
795 - <provider selected="true" editor-type-id="text-editor">  
796 - <state relative-caret-position="1892">  
797 - <caret line="185" selection-start-line="185" selection-end-line="186" />  
798 - </state>  
799 - </provider>  
800 - </entry>  
801 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml"> 682 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
802 <provider selected="true" editor-type-id="text-editor"> 683 <provider selected="true" editor-type-id="text-editor">
803 <state relative-caret-position="212"> 684 <state relative-caret-position="212">
@@ -823,12 +704,6 @@ @@ -823,12 +704,6 @@
823 <provider selected="true" editor-type-id="text-editor"> 704 <provider selected="true" editor-type-id="text-editor">
824 <state relative-caret-position="-1731"> 705 <state relative-caret-position="-1731">
825 <caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" /> 706 <caret line="32" column="27" selection-start-line="32" selection-start-column="27" selection-end-line="32" selection-end-column="27" />
826 - <folding>  
827 - <element signature="e#805#1273#0" />  
828 - <element signature="e#1303#1430#0" />  
829 - <element signature="e#1468#2604#0" />  
830 - <element signature="e#2629#3843#0" />  
831 - </folding>  
832 </state> 707 </state>
833 </provider> 708 </provider>
834 </entry> 709 </entry>
@@ -874,27 +749,6 @@ @@ -874,27 +749,6 @@
874 </state> 749 </state>
875 </provider> 750 </provider>
876 </entry> 751 </entry>
877 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">  
878 - <provider selected="true" editor-type-id="text-editor">  
879 - <state relative-caret-position="641">  
880 - <caret line="361" column="28" lean-forward="true" selection-start-line="361" selection-start-column="28" selection-end-line="361" selection-end-column="28" />  
881 - </state>  
882 - </provider>  
883 - </entry>  
884 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">  
885 - <provider selected="true" editor-type-id="text-editor">  
886 - <state relative-caret-position="356">  
887 - <caret line="135" column="8" lean-forward="true" selection-start-line="135" selection-start-column="8" selection-end-line="143" selection-end-column="9" />  
888 - <folding>  
889 - <element signature="e#436#575#0" />  
890 - <element signature="e#610#693#0" />  
891 - <element signature="e#724#1510#0" />  
892 - <element signature="e#1539#3054#0" />  
893 - <element signature="e#3694#3993#0" />  
894 - </folding>  
895 - </state>  
896 - </provider>  
897 - </entry>  
898 <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml"> 752 <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml">
899 <provider selected="true" editor-type-id="text-editor"> 753 <provider selected="true" editor-type-id="text-editor">
900 <state relative-caret-position="330"> 754 <state relative-caret-position="330">
@@ -906,10 +760,6 @@ @@ -906,10 +760,6 @@
906 <provider selected="true" editor-type-id="text-editor"> 760 <provider selected="true" editor-type-id="text-editor">
907 <state relative-caret-position="125"> 761 <state relative-caret-position="125">
908 <caret line="36" column="7" selection-start-line="36" selection-start-column="7" selection-end-line="37" selection-end-column="40" /> 762 <caret line="36" column="7" selection-start-line="36" selection-start-column="7" selection-end-line="37" selection-end-column="40" />
909 - <folding>  
910 - <element signature="e#1630#5581#0" />  
911 - <element signature="e#6965#7419#0" />  
912 - </folding>  
913 </state> 763 </state>
914 </provider> 764 </provider>
915 </entry> 765 </entry>
@@ -951,69 +801,135 @@ @@ -951,69 +801,135 @@
951 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml"> 801 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
952 <provider selected="true" editor-type-id="text-editor" /> 802 <provider selected="true" editor-type-id="text-editor" />
953 </entry> 803 </entry>
954 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js"> 804 + <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml">
955 <provider selected="true" editor-type-id="text-editor"> 805 <provider selected="true" editor-type-id="text-editor">
956 - <state relative-caret-position="495">  
957 - <caret line="170" column="49" selection-start-line="170" selection-start-column="36" selection-end-line="170" selection-end-column="49" /> 806 + <state relative-caret-position="594">
  807 + <caret line="27" column="13" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="13" />
958 </state> 808 </state>
959 </provider> 809 </provider>
960 </entry> 810 </entry>
961 <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js"> 811 <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js">
962 <provider selected="true" editor-type-id="text-editor"> 812 <provider selected="true" editor-type-id="text-editor">
963 - <state relative-caret-position="74"> 813 + <state relative-caret-position="1386">
964 <caret line="63" column="34" lean-forward="true" selection-start-line="63" selection-start-column="34" selection-end-line="63" selection-end-column="34" /> 814 <caret line="63" column="34" lean-forward="true" selection-start-line="63" selection-start-column="34" selection-end-line="63" selection-end-column="34" />
965 </state> 815 </state>
966 </provider> 816 </provider>
967 </entry> 817 </entry>
  818 + <entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.wxml">
  819 + <provider selected="true" editor-type-id="text-editor">
  820 + <state relative-caret-position="2024">
  821 + <caret line="92" column="49" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="49" />
  822 + </state>
  823 + </provider>
  824 + </entry>
  825 + <entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.js">
  826 + <provider selected="true" editor-type-id="text-editor">
  827 + <state relative-caret-position="1364">
  828 + <caret line="62" column="34" lean-forward="true" selection-start-line="62" selection-start-column="34" selection-end-line="62" selection-end-column="34" />
  829 + </state>
  830 + </provider>
  831 + </entry>
  832 + <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
  833 + <provider selected="true" editor-type-id="text-editor">
  834 + <state relative-caret-position="2332">
  835 + <caret line="106" column="73" selection-start-line="106" selection-start-column="73" selection-end-line="106" selection-end-column="73" />
  836 + </state>
  837 + </provider>
  838 + </entry>
968 <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml"> 839 <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml">
969 <provider selected="true" editor-type-id="text-editor"> 840 <provider selected="true" editor-type-id="text-editor">
970 - <state relative-caret-position="740"> 841 + <state relative-caret-position="1254">
971 <caret line="57" column="63" lean-forward="true" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="63" /> 842 <caret line="57" column="63" lean-forward="true" selection-start-line="57" selection-start-column="63" selection-end-line="57" selection-end-column="63" />
972 </state> 843 </state>
973 </provider> 844 </provider>
974 </entry> 845 </entry>
975 <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js"> 846 <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js">
976 <provider selected="true" editor-type-id="text-editor"> 847 <provider selected="true" editor-type-id="text-editor">
977 - <state relative-caret-position="-28"> 848 + <state relative-caret-position="1958">
978 <caret line="89" column="5" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" /> 849 <caret line="89" column="5" selection-start-line="89" selection-start-column="5" selection-end-line="89" selection-end-column="5" />
979 </state> 850 </state>
980 </provider> 851 </provider>
981 </entry> 852 </entry>
982 - <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml"> 853 + <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
983 <provider selected="true" editor-type-id="text-editor"> 854 <provider selected="true" editor-type-id="text-editor">
984 - <state relative-caret-position="594">  
985 - <caret line="27" column="13" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="13" /> 855 + <state relative-caret-position="154">
  856 + <caret line="24" column="22" lean-forward="true" selection-start-line="24" selection-start-column="22" selection-end-line="24" selection-end-column="22" />
986 </state> 857 </state>
987 </provider> 858 </provider>
988 </entry> 859 </entry>
989 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml"> 860 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
990 <provider selected="true" editor-type-id="text-editor"> 861 <provider selected="true" editor-type-id="text-editor">
991 - <state relative-caret-position="509">  
992 - <caret line="134" column="31" lean-forward="true" selection-start-line="134" selection-start-column="31" selection-end-line="134" selection-end-column="31" /> 862 + <state relative-caret-position="2530">
  863 + <caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />
  864 + <folding>
  865 + <element signature="e#152#1691#0" />
  866 + </folding>
993 </state> 867 </state>
994 </provider> 868 </provider>
995 </entry> 869 </entry>
996 - <entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.wxml"> 870 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
997 <provider selected="true" editor-type-id="text-editor"> 871 <provider selected="true" editor-type-id="text-editor">
998 - <state relative-caret-position="1232">  
999 - <caret line="92" column="49" selection-start-line="92" selection-start-column="44" selection-end-line="92" selection-end-column="49" /> 872 + <state relative-caret-position="792">
  873 + <caret line="36" column="50" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="50" />
1000 </state> 874 </state>
1001 </provider> 875 </provider>
1002 </entry> 876 </entry>
1003 - <entry file="file://$PROJECT_DIR$/pages/my/takeGroupBuy/takeGroupBuy.js"> 877 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
1004 <provider selected="true" editor-type-id="text-editor"> 878 <provider selected="true" editor-type-id="text-editor">
1005 - <state relative-caret-position="674">  
1006 - <caret line="62" column="34" lean-forward="true" selection-start-line="62" selection-start-column="34" selection-end-line="62" selection-end-column="34" /> 879 + <state relative-caret-position="3564">
  880 + <caret line="162" column="79" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="79" />
1007 </state> 881 </state>
1008 </provider> 882 </provider>
1009 </entry> 883 </entry>
1010 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.js"> 884 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
  885 + <provider selected="true" editor-type-id="text-editor">
  886 + <state relative-caret-position="1694">
  887 + <caret line="77" column="60" selection-start-line="77" selection-start-column="60" selection-end-line="77" selection-end-column="60" />
  888 + </state>
  889 + </provider>
  890 + </entry>
  891 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
  892 + <provider selected="true" editor-type-id="text-editor">
  893 + <state relative-caret-position="22">
  894 + <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
  895 + </state>
  896 + </provider>
  897 + </entry>
  898 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
1011 <provider selected="true" editor-type-id="text-editor"> 899 <provider selected="true" editor-type-id="text-editor">
1012 - <state relative-caret-position="773">  
1013 - <caret line="159" column="10" lean-forward="true" selection-start-line="159" selection-start-column="10" selection-end-line="159" selection-end-column="10" /> 900 + <state relative-caret-position="264">
  901 + <caret line="13" column="96" selection-start-line="13" selection-start-column="96" selection-end-line="13" selection-end-column="96" />
1014 <folding> 902 <folding>
1015 - <element signature="e#152#1691#0" />  
1016 - <element signature="e#4857#8107#0" /> 903 + <element signature="n#!!doc" expanded="true" />
  904 + </folding>
  905 + </state>
  906 + </provider>
  907 + </entry>
  908 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
  909 + <provider selected="true" editor-type-id="text-editor">
  910 + <state relative-caret-position="7942">
  911 + <caret line="361" column="28" lean-forward="true" selection-start-line="361" selection-start-column="28" selection-end-line="361" selection-end-column="28" />
  912 + </state>
  913 + </provider>
  914 + </entry>
  915 + <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
  916 + <provider selected="true" editor-type-id="text-editor">
  917 + <state relative-caret-position="1672">
  918 + <caret line="76" column="28" selection-start-line="76" selection-start-column="28" selection-end-line="76" selection-end-column="28" />
  919 + </state>
  920 + </provider>
  921 + </entry>
  922 + <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
  923 + <provider selected="true" editor-type-id="text-editor" />
  924 + </entry>
  925 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
  926 + <provider selected="true" editor-type-id="text-editor">
  927 + <state relative-caret-position="418">
  928 + <caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
  929 + <folding>
  930 + <element signature="n#style#0;n#view#0;n#view#0;n#!!top" expanded="true" />
  931 + <element signature="n#style#0;n#view#1;n#view#0;n#!!top" expanded="true" />
  932 + <element signature="n#style#0;n#image#0;n#view#1;n#view#0;n#!!top" expanded="true" />
1017 </folding> 933 </folding>
1018 </state> 934 </state>
1019 </provider> 935 </provider>
@@ -102,6 +102,7 @@ Page({ @@ -102,6 +102,7 @@ Page({
102 }, 102 },
103 //打卡 103 //打卡
104 punch() { 104 punch() {
  105 + console.log('city', wx.getStorageSync('city'));
105 if(wx.getStorageSync('city') !== '') { 106 if(wx.getStorageSync('city') !== '') {
106 if (this.data.test.name !== '') { 107 if (this.data.test.name !== '') {
107 let url = '/portal/Experiment/user_sign'; 108 let url = '/portal/Experiment/user_sign';
@@ -153,10 +154,16 @@ Page({ @@ -153,10 +154,16 @@ Page({
153 }; 154 };
154 app.post(url, params, header).then((res) => { 155 app.post(url, params, header).then((res) => {
155 console.log('获取用户所在实验室', res); 156 console.log('获取用户所在实验室', res);
  157 + if(res === undefined) {
  158 + this.setData({
  159 + ['test.name']: ''
  160 + });
  161 + }else {
156 this.setData({ 162 this.setData({
157 test: res 163 test: res
158 }); 164 });
159 // this.punch(); 165 // this.punch();
  166 + }
160 }) 167 })
161 }, 168 },
162 //打卡页面获取位置授权 169 //打卡页面获取位置授权
@@ -56,6 +56,11 @@ page { @@ -56,6 +56,11 @@ page {
56 padding: 80rpx; 56 padding: 80rpx;
57 box-sizing: border-box; 57 box-sizing: border-box;
58 } 58 }
  59 +.circle_small text {
  60 + /* width:90rpx; */
  61 + /* height:90rpx; */
  62 + text-align: center;
  63 +}
59 .icon-dui{ 64 .icon-dui{
60 font-size: 90rpx; 65 font-size: 90rpx;
61 } 66 }
1 <!--pages/index/activity-detail/activity-detail.wxml--> 1 <!--pages/index/activity-detail/activity-detail.wxml-->
2 <view class="content"> 2 <view class="content">
3 - <view class="head"> 3 + <view class="head" style="border-bottom: 20rpx solid #f2f2f2">
4 <view class="img_box"> 4 <view class="img_box">
5 - <image src="{{detail.thumb}}" class="activity_img" mode="aspectFill"></image> 5 + <!--<image src="{{detail.thumb}}" class="activity_img" mode="aspectFill"></image>-->
  6 + <image src="../../../images/test_img.jpg" class="activity_img" mode="aspectFill"></image>
6 </view> 7 </view>
7 <view class="title"> 8 <view class="title">
8 <view class="line"></view> 9 <view class="line"></view>
9 <view class="test_detail"> 10 <view class="test_detail">
10 - <text>{{detail.name}}</text>  
11 - <view class="describe">{{detail.description}}</view> 11 + <text>科学队长实验室：雷电的产生！{{detail.name}}</text>
  12 + <view class="describe">云和云摩擦碰撞发出的声音是雷声产生火花是闪电。{{detail.description}}</view>
12 </view> 13 </view>
13 </view> 14 </view>
14 </view> 15 </view>
15 16
16 - <view class="jiexi">解析长图 17 + <view class="jiexi" style="margin-bottom: 150rpx">
  18 + <image src="../../../images/i.jpg" style="width:100%;height:100%;"></image>
17 <import src="/wxParse/wxParse.wxml"/> 19 <import src="/wxParse/wxParse.wxml"/>
18 <template is="wxParse" data="{{wxParseData:article.nodes}}"/> 20 <template is="wxParse" data="{{wxParseData:article.nodes}}"/>
19 </view> 21 </view>
@@ -11,6 +11,7 @@ Page({ @@ -11,6 +11,7 @@ Page({
11 {'url': '../../images/banner.jpg'}, 11 {'url': '../../images/banner.jpg'},
12 {'url': '../../images/banner.jpg'}, 12 {'url': '../../images/banner.jpg'},
13 {'url': '../../images/banner.jpg'},], 13 {'url': '../../images/banner.jpg'},],
  14 + imgs: [{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},{'image': '../../images/banner.jpg'},],
14 cur: 0, 15 cur: 0,
15 currentSwiper: 0, 16 currentSwiper: 0,
16 autoplay: true, //是否自动轮播 17 autoplay: true, //是否自动轮播
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 <view class="wrap"> 7 <view class="wrap">
8 <swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true" 8 <swiper autoplay="{{autoplay}}" interval="{{interval}}" duration="{{duration}}" circular="true"
9 bindchange="swiperChange" current="{{cur}}"> 9 bindchange="swiperChange" current="{{cur}}">
10 - <block wx:for="{{imgUrls}}" wx:key="index"> 10 + <block wx:for="{{imgs}}" wx:key="index">
11 <swiper-item> 11 <swiper-item>
12 <navigator url="{{item.url}}" hover-class="navigator-hover"> 12 <navigator url="{{item.url}}" hover-class="navigator-hover">
13 <view class="index_top"> 13 <view class="index_top">
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </block> 18 </block>
19 </swiper> 19 </swiper>
20 <view class="dots"> 20 <view class="dots">
21 - <block wx:for="{{ imgUrls}}" wx:key="index" wx:for-index="idx"> 21 + <block wx:for="{{ imgs}}" wx:key="index" wx:for-index="idx">
22 <view class="dot{{idx == currentSwiper ? ' active' : ''}}"></view> 22 <view class="dot{{idx == currentSwiper ? ' active' : ''}}"></view>
23 </block> 23 </block>
24 </view> 24 </view>
@@ -53,7 +53,8 @@ @@ -53,7 +53,8 @@
53 <view class="test_box"> 53 <view class="test_box">
54 <view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view> 54 <view class="time">{{this_week_test_info.start_time}} - {{this_week_test_info.end_time}}</view>
55 <view class="img_box"> 55 <view class="img_box">
56 - <image src="{{this_week_test_info.thumb}}" mode="aspectFill"></image> 56 + <!--<image src="{{this_week_test_info.thumb}}" mode="aspectFill"></image>-->
  57 + <image src="../../images/test_img.jpg" mode="aspectFill"></image>
57 </view> 58 </view>
58 </view> 59 </view>
59 <view class="order_box"> 60 <view class="order_box">
@@ -73,7 +74,8 @@ @@ -73,7 +74,8 @@
73 <view class="test_box"> 74 <view class="test_box">
74 <view class="time">{{item.start_time}} - {{item.end_time}}</view> 75 <view class="time">{{item.start_time}} - {{item.end_time}}</view>
75 <view class="img_box"> 76 <view class="img_box">
76 - <image src="{{item.thumb}}" mode="aspectFill"></image> 77 + <!--<image src="{{item.thumb}}" mode="aspectFill"></image>-->
  78 + <image src="../../images/test_img.jpg" mode="aspectFill"></image>
77 </view> 79 </view>
78 </view> 80 </view>
79 <view class="order_box"> 81 <view class="order_box">