miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 6e898ba50b9aefec317e1142916f599036a0b32d 2 个父辈 bda59fc5 96772064

合并分支 'wumengyu' 到 'master' 

Wumengyu



查看合并请求 !6
内嵌 并排对比
正在显示 7 个修改的文件 包含 242 行增加 和 174 行删除
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="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑"> 4 + <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="添加未购卡片">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/pages/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.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" />  
9 - <change beforePath="$PROJECT_DIR$/pages/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />  
10 - <change beforePath="$PROJECT_DIR$/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxml" 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" />
11 </list> 10 </list>
12 <ignored path="$PROJECT_DIR$/.tmp/" /> 11 <ignored path="$PROJECT_DIR$/.tmp/" />
13 <ignored path="$PROJECT_DIR$/temp/" /> 12 <ignored path="$PROJECT_DIR$/temp/" />
@@ -22,48 +21,49 @@ @@ -22,48 +21,49 @@
22 <session id="-381596063"> 21 <session id="-381596063">
23 <usages-collector id="statistics.lifecycle.project"> 22 <usages-collector id="statistics.lifecycle.project">
24 <counts> 23 <counts>
25 - <entry key="project.closed" value="20" /> 24 + <entry key="project.closed" value="23" />
26 <entry key="project.open.time.0" value="6" /> 25 <entry key="project.open.time.0" value="6" />
27 - <entry key="project.open.time.1" value="8" /> 26 + <entry key="project.open.time.1" value="9" />
28 <entry key="project.open.time.10" value="1" /> 27 <entry key="project.open.time.10" value="1" />
  28 + <entry key="project.open.time.13" value="1" />
29 <entry key="project.open.time.2" value="3" /> 29 <entry key="project.open.time.2" value="3" />
30 - <entry key="project.open.time.8" value="2" /> 30 + <entry key="project.open.time.8" value="3" />
31 <entry key="project.open.time.9" value="2" /> 31 <entry key="project.open.time.9" value="2" />
32 - <entry key="project.opened" value="22" /> 32 + <entry key="project.opened" value="25" />
33 </counts> 33 </counts>
34 </usages-collector> 34 </usages-collector>
35 <usages-collector id="statistics.file.extensions.open"> 35 <usages-collector id="statistics.file.extensions.open">
36 <counts> 36 <counts>
37 - <entry key="js" value="169" /> 37 + <entry key="js" value="172" />
38 <entry key="json" value="31" /> 38 <entry key="json" value="31" />
39 - <entry key="wxml" value="133" />  
40 - <entry key="wxss" value="51" /> 39 + <entry key="wxml" value="138" />
  40 + <entry key="wxss" value="54" />
41 </counts> 41 </counts>
42 </usages-collector> 42 </usages-collector>
43 <usages-collector id="statistics.file.types.open"> 43 <usages-collector id="statistics.file.types.open">
44 <counts> 44 <counts>
45 - <entry key="CSS" value="51" />  
46 - <entry key="HTML" value="133" /> 45 + <entry key="CSS" value="54" />
  46 + <entry key="HTML" value="138" />
47 <entry key="JSON" value="31" /> 47 <entry key="JSON" value="31" />
48 - <entry key="JavaScript" value="169" /> 48 + <entry key="JavaScript" value="172" />
49 </counts> 49 </counts>
50 </usages-collector> 50 </usages-collector>
51 <usages-collector id="statistics.file.extensions.edit"> 51 <usages-collector id="statistics.file.extensions.edit">
52 <counts> 52 <counts>
53 - <entry key="js" value="15197" /> 53 + <entry key="js" value="15207" />
54 <entry key="json" value="158" /> 54 <entry key="json" value="158" />
55 - <entry key="txt" value="436" />  
56 - <entry key="wxml" value="3633" />  
57 - <entry key="wxss" value="1590" /> 55 + <entry key="txt" value="451" />
  56 + <entry key="wxml" value="3774" />
  57 + <entry key="wxss" value="1627" />
58 </counts> 58 </counts>
59 </usages-collector> 59 </usages-collector>
60 <usages-collector id="statistics.file.types.edit"> 60 <usages-collector id="statistics.file.types.edit">
61 <counts> 61 <counts>
62 - <entry key="CSS" value="1590" />  
63 - <entry key="HTML" value="3633" /> 62 + <entry key="CSS" value="1627" />
  63 + <entry key="HTML" value="3774" />
64 <entry key="JSON" value="158" /> 64 <entry key="JSON" value="158" />
65 - <entry key="JavaScript" value="15197" />  
66 - <entry key="PLAIN_TEXT" value="436" /> 65 + <entry key="JavaScript" value="15207" />
  66 + <entry key="PLAIN_TEXT" value="451" />
67 </counts> 67 </counts>
68 </usages-collector> 68 </usages-collector>
69 <usages-collector id="statistics.vcs.git.usages"> 69 <usages-collector id="statistics.vcs.git.usages">
@@ -76,75 +76,64 @@ @@ -76,75 +76,64 @@
76 <component name="FileEditorManager"> 76 <component name="FileEditorManager">
77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
78 <file pinned="false" current-in-tab="false"> 78 <file pinned="false" current-in-tab="false">
79 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.js"> 79 + <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml">
80 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
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" />  
83 - <folding>  
84 - <element signature="e#152#1691#0" />  
85 - </folding> 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" />
86 </state> 83 </state>
87 </provider> 84 </provider>
88 </entry> 85 </entry>
89 </file> 86 </file>
90 <file pinned="false" current-in-tab="false"> 87 <file pinned="false" current-in-tab="false">
91 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml"> 88 + <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
92 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
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" /> 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" />
95 </state> 92 </state>
96 </provider> 93 </provider>
97 </entry> 94 </entry>
98 </file> 95 </file>
99 <file pinned="false" current-in-tab="false"> 96 <file pinned="false" current-in-tab="false">
100 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js"> 97 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
101 <provider selected="true" editor-type-id="text-editor"> 98 <provider selected="true" editor-type-id="text-editor">
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" /> 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" />
104 </state> 101 </state>
105 </provider> 102 </provider>
106 </entry> 103 </entry>
107 </file> 104 </file>
108 <file pinned="false" current-in-tab="false"> 105 <file pinned="false" current-in-tab="false">
109 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml"> 106 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
110 <provider selected="true" editor-type-id="text-editor"> 107 <provider selected="true" editor-type-id="text-editor">
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" /> 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" />
113 </state> 110 </state>
114 </provider> 111 </provider>
115 </entry> 112 </entry>
116 </file> 113 </file>
117 <file pinned="false" current-in-tab="true"> 114 <file pinned="false" current-in-tab="true">
118 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml"> 115 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
119 <provider selected="true" editor-type-id="text-editor"> 116 <provider selected="true" editor-type-id="text-editor">
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> 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" />
127 </state> 119 </state>
128 </provider> 120 </provider>
129 </entry> 121 </entry>
130 </file> 122 </file>
131 <file pinned="false" current-in-tab="false"> 123 <file pinned="false" current-in-tab="false">
132 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js"> 124 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
133 <provider selected="true" editor-type-id="text-editor"> 125 <provider selected="true" editor-type-id="text-editor">
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" /> 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" />
136 </state> 128 </state>
137 </provider> 129 </provider>
138 </entry> 130 </entry>
139 </file> 131 </file>
140 <file pinned="false" current-in-tab="false"> 132 <file pinned="false" current-in-tab="false">
141 - <entry file="file://$PROJECT_DIR$/pages/index/index.js"> 133 + <entry file="file://$PROJECT_DIR$/app.js">
142 <provider selected="true" editor-type-id="text-editor"> 134 <provider selected="true" editor-type-id="text-editor">
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> 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" />
148 </state> 137 </state>
149 </provider> 138 </provider>
150 </entry> 139 </entry>
@@ -176,17 +165,6 @@ @@ -176,17 +165,6 @@
176 </component> 165 </component>
177 <component name="FindInProjectRecents"> 166 <component name="FindInProjectRecents">
178 <findStrings> 167 <findStrings>
179 - <find>refreshBuyState</find>  
180 - <find>getAppointmentInfo</find>  
181 - <find>student_id</find>  
182 - <find>indexOf</find>  
183 - <find>new_itmes</find>  
184 - <find>请选择两个学员</find>  
185 - <find>has_more</find>  
186 - <find>changeState</find>  
187 - <find>picker</find>  
188 - <find>num</find>  
189 - <find>is_choose_student</find>  
190 <find>reservation_id</find> 168 <find>reservation_id</find>
191 <find>currentTab</find> 169 <find>currentTab</find>
192 <find>student_num</find> 170 <find>student_num</find>
@@ -206,6 +184,17 @@ @@ -206,6 +184,17 @@
206 <find>recordList</find> 184 <find>recordList</find>
207 <find>page_number</find> 185 <find>page_number</find>
208 <find>delStudent</find> 186 <find>delStudent</find>
  187 + <find>swiper</find>
  188 + <find>兑换</find>
  189 + <find>mode=&quot;date&quot;</find>
  190 + <find>birth_date</find>
  191 + <find>default_birth</find>
  192 + <find>删除</find>
  193 + <find>wxparse</find>
  194 + <find>copy</find>
  195 + <find>chargenum</find>
  196 + <find>redeem_code</find>
  197 + <find>picker-box</find>
209 </findStrings> 198 </findStrings>
210 <dirStrings> 199 <dirStrings>
211 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir> 200 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
@@ -230,8 +219,6 @@ @@ -230,8 +219,6 @@
230 <component name="IdeDocumentHistory"> 219 <component name="IdeDocumentHistory">
231 <option name="CHANGED_PATHS"> 220 <option name="CHANGED_PATHS">
232 <list> 221 <list>
233 - <option value="$PROJECT_DIR$/pages/my/charge/charge.js" />  
234 - <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />  
235 <option value="$PROJECT_DIR$/app.wxss" /> 222 <option value="$PROJECT_DIR$/app.wxss" />
236 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" /> 223 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
237 <option value="$PROJECT_DIR$/templates/templates.wxss" /> 224 <option value="$PROJECT_DIR$/templates/templates.wxss" />
@@ -267,20 +254,22 @@ @@ -267,20 +254,22 @@
267 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" /> 254 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" />
268 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" /> 255 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" />
269 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js" /> 256 <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js" />
270 - <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" />  
271 - <option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" />  
272 <option value="$PROJECT_DIR$/pages/my/myCard/myCard.js" /> 257 <option value="$PROJECT_DIR$/pages/my/myCard/myCard.js" />
273 - <option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" />  
274 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" /> 258 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.js" />
275 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" /> 259 <option value="$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml" />
276 - <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" />  
277 - <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" />  
278 - <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" />  
279 <option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" /> 260 <option value="$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.js" />
280 <option value="$PROJECT_DIR$/pages/index/index.js" /> 261 <option value="$PROJECT_DIR$/pages/index/index.js" />
281 <option value="$PROJECT_DIR$/pages/index/index.wxml" /> 262 <option value="$PROJECT_DIR$/pages/index/index.wxml" />
282 <option value="$PROJECT_DIR$/pages/clock/clock.js" /> 263 <option value="$PROJECT_DIR$/pages/clock/clock.js" />
283 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" /> 264 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
  265 + <option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxss" />
  266 + <option value="$PROJECT_DIR$/pages/my/myCard/myCard.wxml" />
  267 + <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.wxml" />
  268 + <option value="$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js" />
  269 + <option value="$PROJECT_DIR$/pages/my/charge/charge.wxml" />
  270 + <option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
  271 + <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml" />
  272 + <option value="$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss" />
284 </list> 273 </list>
285 </option> 274 </option>
286 </component> 275 </component>
@@ -291,8 +280,8 @@ @@ -291,8 +280,8 @@
291 <sorting>DEFINITION_ORDER</sorting> 280 <sorting>DEFINITION_ORDER</sorting>
292 </component> 281 </component>
293 <component name="ProjectFrameBounds" extendedState="6"> 282 <component name="ProjectFrameBounds" extendedState="6">
294 - <option name="x" value="-3" />  
295 - <option name="y" value="1" /> 283 + <option name="x" value="416" />
  284 + <option name="y" value="15" />
296 <option name="width" value="1936" /> 285 <option name="width" value="1936" />
297 <option name="height" value="1047" /> 286 <option name="height" value="1047" />
298 </component> 287 </component>
@@ -350,6 +339,13 @@ @@ -350,6 +339,13 @@
350 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 339 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
351 <item name="pages" type="462c0819:PsiDirectoryNode" /> 340 <item name="pages" type="462c0819:PsiDirectoryNode" />
352 <item name="my" type="462c0819:PsiDirectoryNode" /> 341 <item name="my" type="462c0819:PsiDirectoryNode" />
  342 + <item name="appointmentRecord" type="462c0819:PsiDirectoryNode" />
  343 + </path>
  344 + <path>
  345 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  346 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  347 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  348 + <item name="my" type="462c0819:PsiDirectoryNode" />
353 <item name="buyCard" type="462c0819:PsiDirectoryNode" /> 349 <item name="buyCard" type="462c0819:PsiDirectoryNode" />
354 </path> 350 </path>
355 <path> 351 <path>
@@ -357,6 +353,20 @@ @@ -357,6 +353,20 @@
357 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 353 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
358 <item name="pages" type="462c0819:PsiDirectoryNode" /> 354 <item name="pages" type="462c0819:PsiDirectoryNode" />
359 <item name="my" type="462c0819:PsiDirectoryNode" /> 355 <item name="my" type="462c0819:PsiDirectoryNode" />
  356 + <item name="charge" type="462c0819:PsiDirectoryNode" />
  357 + </path>
  358 + <path>
  359 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  360 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  361 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  362 + <item name="my" type="462c0819:PsiDirectoryNode" />
  363 + <item name="edit-student" type="462c0819:PsiDirectoryNode" />
  364 + </path>
  365 + <path>
  366 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  367 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  368 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  369 + <item name="my" type="462c0819:PsiDirectoryNode" />
360 <item name="groupBuy" type="462c0819:PsiDirectoryNode" /> 370 <item name="groupBuy" type="462c0819:PsiDirectoryNode" />
361 </path> 371 </path>
362 <path> 372 <path>
@@ -364,6 +374,13 @@ @@ -364,6 +374,13 @@
364 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 374 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
365 <item name="pages" type="462c0819:PsiDirectoryNode" /> 375 <item name="pages" type="462c0819:PsiDirectoryNode" />
366 <item name="my" type="462c0819:PsiDirectoryNode" /> 376 <item name="my" type="462c0819:PsiDirectoryNode" />
  377 + <item name="myCard" type="462c0819:PsiDirectoryNode" />
  378 + </path>
  379 + <path>
  380 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  381 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  382 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  383 + <item name="my" type="462c0819:PsiDirectoryNode" />
367 <item name="myProfile" type="462c0819:PsiDirectoryNode" /> 384 <item name="myProfile" type="462c0819:PsiDirectoryNode" />
368 </path> 385 </path>
369 <path> 386 <path>
@@ -443,7 +460,10 @@ @@ -443,7 +460,10 @@
443 <workItem from="1545095024314" duration="3201000" /> 460 <workItem from="1545095024314" duration="3201000" />
444 <workItem from="1545181336636" duration="27359000" /> 461 <workItem from="1545181336636" duration="27359000" />
445 <workItem from="1545267535141" duration="7730000" /> 462 <workItem from="1545267535141" duration="7730000" />
446 - <workItem from="1545354042642" duration="610000" /> 463 + <workItem from="1545354042642" duration="5649000" />
  464 + <workItem from="1545441360042" duration="4461000" />
  465 + <workItem from="1545627102606" duration="3505000" />
  466 + <workItem from="1545700023575" duration="3152000" />
447 </task> 467 </task>
448 <task id="LOCAL-00001" summary="modal 模板"> 468 <task id="LOCAL-00001" summary="modal 模板">
449 <created>1542274356914</created> 469 <created>1542274356914</created>
@@ -515,14 +535,28 @@ @@ -515,14 +535,28 @@
515 <option name="project" value="LOCAL" /> 535 <option name="project" value="LOCAL" />
516 <updated>1545209715916</updated> 536 <updated>1545209715916</updated>
517 </task> 537 </task>
518 - <option name="localTasksCounter" value="11" /> 538 + <task id="LOCAL-00011" summary="添加默认图，测试用">
  539 + <created>1545356541300</created>
  540 + <option name="number" value="00011" />
  541 + <option name="presentableId" value="LOCAL-00011" />
  542 + <option name="project" value="LOCAL" />
  543 + <updated>1545356541300</updated>
  544 + </task>
  545 + <task id="LOCAL-00012" summary="添加未购卡片">
  546 + <created>1545382588706</created>
  547 + <option name="number" value="00012" />
  548 + <option name="presentableId" value="LOCAL-00012" />
  549 + <option name="project" value="LOCAL" />
  550 + <updated>1545382588706</updated>
  551 + </task>
  552 + <option name="localTasksCounter" value="13" />
519 <servers /> 553 <servers />
520 </component> 554 </component>
521 <component name="TimeTrackingManager"> 555 <component name="TimeTrackingManager">
522 - <option name="totallyTimeSpent" value="242803000" /> 556 + <option name="totallyTimeSpent" value="258960000" />
523 </component> 557 </component>
524 <component name="ToolWindowManager"> 558 <component name="ToolWindowManager">
525 - <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 559 + <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
526 <editor active="true" /> 560 <editor active="true" />
527 <layout> 561 <layout>
528 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" /> 562 <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
@@ -538,7 +572,7 @@ @@ -538,7 +572,7 @@
538 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 572 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
539 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" /> 573 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
540 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" /> 574 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" />
541 - <window_info anchor="bottom" id="Version Control" order="10" weight="0.5780911" /> 575 + <window_info anchor="bottom" id="Version Control" order="10" weight="0.5759219" />
542 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 576 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
543 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 577 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
544 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 578 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -587,29 +621,11 @@ @@ -587,29 +621,11 @@
587 <MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" /> 621 <MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
588 <MESSAGE value="申诉详情，二次申诉" /> 622 <MESSAGE value="申诉详情，二次申诉" />
589 <MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" /> 623 <MESSAGE value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" />
590 - <option name="LAST_COMMIT_MESSAGE" value="优化申诉详情，优化打卡，优化预约时购买畅玩卡并提交，用户拒绝授权时默认加载北京的轮播图，添加空预约记录页和上拉加载，&#10;购卡页添加学员的加载更多事件，添加团购分享好友页接口，修改团购详情页分享后再次打开的页面，添加我的畅玩卡接口，修改确认订单逻辑" /> 624 + <MESSAGE value="添加默认图，测试用" />
  625 + <MESSAGE value="添加未购卡片" />
  626 + <option name="LAST_COMMIT_MESSAGE" value="添加未购卡片" />
591 </component> 627 </component>
592 <component name="editorHistoryManager"> 628 <component name="editorHistoryManager">
593 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">  
594 - <provider selected="true" editor-type-id="text-editor">  
595 - <state relative-caret-position="440">  
596 - <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />  
597 - </state>  
598 - </provider>  
599 - </entry>  
600 - <entry file="file://$PROJECT_DIR$/wxParse/html2json.js">  
601 - <provider selected="true" editor-type-id="text-editor" />  
602 - </entry>  
603 - <entry file="file://$PROJECT_DIR$/wxParse/htmlparser.js">  
604 - <provider selected="true" editor-type-id="text-editor" />  
605 - </entry>  
606 - <entry file="file://$PROJECT_DIR$/wxParse/showdown.js">  
607 - <provider selected="true" editor-type-id="text-editor">  
608 - <state relative-caret-position="112">  
609 - <caret line="18" column="30" lean-forward="true" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />  
610 - </state>  
611 - </provider>  
612 - </entry>  
613 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss"> 629 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
614 <provider selected="true" editor-type-id="text-editor"> 630 <provider selected="true" editor-type-id="text-editor">
615 <state relative-caret-position="704"> 631 <state relative-caret-position="704">
@@ -665,13 +681,6 @@ @@ -665,13 +681,6 @@
665 </state> 681 </state>
666 </provider> 682 </provider>
667 </entry> 683 </entry>
668 - <entry file="file://$PROJECT_DIR$/app.js">  
669 - <provider selected="true" editor-type-id="text-editor">  
670 - <state relative-caret-position="411">  
671 - <caret line="137" column="47" selection-start-line="137" selection-start-column="47" selection-end-line="137" selection-end-column="47" />  
672 - </state>  
673 - </provider>  
674 - </entry>  
675 <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml"> 684 <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
676 <provider selected="true" editor-type-id="text-editor"> 685 <provider selected="true" editor-type-id="text-editor">
677 <state relative-caret-position="520"> 686 <state relative-caret-position="520">
@@ -763,13 +772,6 @@ @@ -763,13 +772,6 @@
763 </state> 772 </state>
764 </provider> 773 </provider>
765 </entry> 774 </entry>
766 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">  
767 - <provider selected="true" editor-type-id="text-editor">  
768 - <state relative-caret-position="440">  
769 - <caret line="26" column="14" selection-start-line="26" selection-start-column="14" selection-end-line="26" selection-end-column="14" />  
770 - </state>  
771 - </provider>  
772 - </entry>  
773 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js"> 775 <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.js">
774 <provider selected="true" editor-type-id="text-editor"> 776 <provider selected="true" editor-type-id="text-editor">
775 <state relative-caret-position="242"> 777 <state relative-caret-position="242">
@@ -784,23 +786,6 @@ @@ -784,23 +786,6 @@
784 </state> 786 </state>
785 </provider> 787 </provider>
786 </entry> 788 </entry>
787 - <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">  
788 - <provider selected="true" editor-type-id="text-editor">  
789 - <state relative-caret-position="132">  
790 - <caret line="6" column="30" lean-forward="true" selection-start-line="6" selection-start-column="30" selection-end-line="6" selection-end-column="30" />  
791 - </state>  
792 - </provider>  
793 - </entry>  
794 - <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxss">  
795 - <provider selected="true" editor-type-id="text-editor">  
796 - <state relative-caret-position="550">  
797 - <caret line="25" column="24" selection-start-line="25" selection-start-column="24" selection-end-line="25" selection-end-column="24" />  
798 - </state>  
799 - </provider>  
800 - </entry>  
801 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">  
802 - <provider selected="true" editor-type-id="text-editor" />  
803 - </entry>  
804 <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml"> 789 <entry file="file://$PROJECT_DIR$/pages/my/shareGroupBuy/shareGroupBuy.wxml">
805 <provider selected="true" editor-type-id="text-editor"> 790 <provider selected="true" editor-type-id="text-editor">
806 <state relative-caret-position="594"> 791 <state relative-caret-position="594">
@@ -829,13 +814,6 @@ @@ -829,13 +814,6 @@
829 </state> 814 </state>
830 </provider> 815 </provider>
831 </entry> 816 </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>  
839 <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml"> 817 <entry file="file://$PROJECT_DIR$/pages/my/groupBuyDetail/groupBuyDetail.wxml">
840 <provider selected="true" editor-type-id="text-editor"> 818 <provider selected="true" editor-type-id="text-editor">
841 <state relative-caret-position="1254"> 819 <state relative-caret-position="1254">
@@ -850,20 +828,10 @@ @@ -850,20 +828,10 @@
850 </state> 828 </state>
851 </provider> 829 </provider>
852 </entry> 830 </entry>
853 - <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">  
854 - <provider selected="true" editor-type-id="text-editor">  
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" />  
857 - </state>  
858 - </provider>  
859 - </entry>  
860 <entry file="file://$PROJECT_DIR$/pages/clock/clock.js"> 831 <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
861 <provider selected="true" editor-type-id="text-editor"> 832 <provider selected="true" editor-type-id="text-editor">
862 <state relative-caret-position="2530"> 833 <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" /> 834 <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>  
867 </state> 835 </state>
868 </provider> 836 </provider>
869 </entry> 837 </entry>
@@ -888,6 +856,20 @@ @@ -888,6 +856,20 @@
888 </state> 856 </state>
889 </provider> 857 </provider>
890 </entry> 858 </entry>
  859 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
  860 + <provider selected="true" editor-type-id="text-editor">
  861 + <state relative-caret-position="418">
  862 + <caret line="19" column="43" lean-forward="true" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
  863 + </state>
  864 + </provider>
  865 + </entry>
  866 + <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxss">
  867 + <provider selected="true" editor-type-id="text-editor">
  868 + <state relative-caret-position="220">
  869 + <caret line="10" column="26" selection-start-line="10" selection-start-column="26" selection-end-line="10" selection-end-column="26" />
  870 + </state>
  871 + </provider>
  872 + </entry>
891 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js"> 873 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
892 <provider selected="true" editor-type-id="text-editor"> 874 <provider selected="true" editor-type-id="text-editor">
893 <state relative-caret-position="22"> 875 <state relative-caret-position="22">
@@ -895,6 +877,31 @@ @@ -895,6 +877,31 @@
895 </state> 877 </state>
896 </provider> 878 </provider>
897 </entry> 879 </entry>
  880 + <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
  881 + <provider selected="true" editor-type-id="text-editor">
  882 + <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" />
  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>
  889 + </provider>
  890 + </entry>
  891 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">
  892 + <provider selected="true" editor-type-id="text-editor">
  893 + <state relative-caret-position="594">
  894 + <caret line="27" column="65" lean-forward="true" selection-start-line="27" selection-start-column="65" selection-end-line="27" selection-end-column="65" />
  895 + </state>
  896 + </provider>
  897 + </entry>
  898 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
  899 + <provider selected="true" editor-type-id="text-editor">
  900 + <state relative-caret-position="638">
  901 + <caret line="29" selection-start-line="29" selection-end-line="30" />
  902 + </state>
  903 + </provider>
  904 + </entry>
898 <entry file="file://$PROJECT_DIR$/pages/index/index.js"> 905 <entry file="file://$PROJECT_DIR$/pages/index/index.js">
899 <provider selected="true" editor-type-id="text-editor"> 906 <provider selected="true" editor-type-id="text-editor">
900 <state relative-caret-position="264"> 907 <state relative-caret-position="264">
@@ -922,15 +929,52 @@ @@ -922,15 +929,52 @@
922 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml"> 929 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
923 <provider selected="true" editor-type-id="text-editor" /> 930 <provider selected="true" editor-type-id="text-editor" />
924 </entry> 931 </entry>
925 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml"> 932 + <entry file="file://$PROJECT_DIR$/app.js">
926 <provider selected="true" editor-type-id="text-editor"> 933 <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" />  
933 - </folding> 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">
  940 + <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" />
  943 + </state>
  944 + </provider>
  945 + </entry>
  946 + <entry file="file://$PROJECT_DIR$/pages/my/groupBuy/groupBuy.js">
  947 + <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" />
  950 + </state>
  951 + </provider>
  952 + </entry>
  953 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
  954 + <provider selected="true" editor-type-id="text-editor">
  955 + <state relative-caret-position="319">
  956 + <caret line="16" column="47" selection-start-line="16" selection-start-column="37" selection-end-line="16" selection-end-column="47" />
  957 + </state>
  958 + </provider>
  959 + </entry>
  960 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
  961 + <provider selected="true" editor-type-id="text-editor">
  962 + <state relative-caret-position="800">
  963 + <caret line="118" column="33" selection-start-line="118" selection-start-column="33" selection-end-line="118" selection-end-column="33" />
  964 + </state>
  965 + </provider>
  966 + </entry>
  967 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
  968 + <provider selected="true" editor-type-id="text-editor">
  969 + <state relative-caret-position="242">
  970 + <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
  971 + </state>
  972 + </provider>
  973 + </entry>
  974 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxss">
  975 + <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" />
934 </state> 978 </state>
935 </provider> 979 </provider>
936 </entry> 980 </entry>
@@ -5,9 +5,11 @@ @@ -5,9 +5,11 @@
5 <view class='list_tab_item'>预约记录</view> 5 <view class='list_tab_item'>预约记录</view>
6 <view class='list_tab_item'>时间</view> 6 <view class='list_tab_item'>时间</view>
7 </view> 7 </view>
8 - <view class='list_tab list_content' wx:for="{{record}}" wx:key="index">  
9 - <view class='list_tab_item'>活动报名</view>  
10 - <view class='list_tab_item'>{{item.time}}</view> 8 + <view class="box">
  9 + <view class='list_tab list_content' wx:for="{{record}}" wx:key="index">
  10 + <view class='list_tab_item'>活动报名</view>
  11 + <view class='list_tab_item'>{{item.time}}</view>
  12 + </view>
11 </view> 13 </view>
12 </view> 14 </view>
13 <view class="no-data" wx:if="{{record.length === 0}}">暂无记录</view> 15 <view class="no-data" wx:if="{{record.length === 0}}">暂无记录</view>
@@ -23,6 +23,9 @@ page { @@ -23,6 +23,9 @@ page {
23 left:0; 23 left:0;
24 z-index:10; 24 z-index:10;
25 } 25 }
  26 +.box {
  27 + margin-top: 100rpx;
  28 +}
26 .list_tab { 29 .list_tab {
27 width: 100%; 30 width: 100%;
28 display: flex; 31 display: flex;
@@ -61,7 +64,6 @@ page { @@ -61,7 +64,6 @@ page {
61 border: 0; 64 border: 0;
62 padding: 15rpx 0; 65 padding: 15rpx 0;
63 z-index:1; 66 z-index:1;
64 - margin-top: 100rpx;  
65 } 67 }
66 68
67 .list_content .list_tab_item { 69 .list_content .list_tab_item {
@@ -14,14 +14,16 @@ @@ -14,14 +14,16 @@
14 <view class='list_input'> 14 <view class='list_input'>
15 <view>绑定学员：</view> 15 <view>绑定学员：</view>
16 <picker value='{{index}}' range='{{picker_list}}' bindchange='changePicker'> 16 <picker value='{{index}}' range='{{picker_list}}' bindchange='changePicker'>
17 - <block wx:if='{{picker_list.length === 0}}'>  
18 - <input placeholder='点击右侧添加学员' placeholder-class='input_style' disabled='true'/>  
19 - </block>  
20 - <block wx:else>  
21 - <text>{{picker_list[index]}}</text>  
22 - </block> 17 + <view class="picker-box">
  18 + <block wx:if='{{picker_list.length === 0}}'>
  19 + <input placeholder='点击右侧添加学员' placeholder-class='input_style' disabled='true'/>
  20 + </block>
  21 + <block wx:else>
  22 + <text>{{picker_list[index]}}</text>
  23 + </block>
  24 + <view class='iconfont icon-daosanjiao'></view>
  25 + </view>
23 </picker> 26 </picker>
24 - <view class='iconfont icon-daosanjiao'></view>  
25 </view> 27 </view>
26 <view class='add_box' bindtap='addUser'> 28 <view class='add_box' bindtap='addUser'>
27 <text class='iconfont icon-jia'></text> 29 <text class='iconfont icon-jia'></text>
@@ -112,4 +112,9 @@ page { @@ -112,4 +112,9 @@ page {
112 } 112 }
113 .service_btn_box::after { 113 .service_btn_box::after {
114 border: 0; 114 border: 0;
  115 +}
  116 +.picker-box {
  117 + display: flex;
  118 + align-items: center;
  119 + justify-content: space-between;
115 } 120 }
1 <!--pages/myCard/myCard.wxml--> 1 <!--pages/myCard/myCard.wxml-->
2 <block> 2 <block>
3 <view class='banner_box'> 3 <view class='banner_box'>
4 - <swiper class='swiper_box' interval='2000' duration='500' current='{{swipercurrent}}' bindchange='swiperCharge'> 4 + <!--未购买畅玩卡-->
  5 + <view class="default-card" wx:if="{{imgsUrl.length === 0}}">
  6 + <view class="banner_img">
  7 + <view class='img_top'>
  8 + <view class='logo_title'>畅玩卡</view>
  9 + </view>
  10 + <view class='img_info'>
  11 + <view class='info_title'>{{service.title}}：</view>
  12 + <view>{{service.description}}</view>
  13 + </view>
  14 + </view>
  15 + </view>
  16 + <!--已购买畅玩卡-->
  17 + <swiper wx:if="{{imgsUrl.length > 0}}" class='swiper_box' interval='2000' duration='500' current='{{swipercurrent}}' bindchange='swiperCharge'>
5 <swiper-item class="banner_img" wx:for='{{imgsUrl || default_card}}' wx:key='index'> 18 <swiper-item class="banner_img" wx:for='{{imgsUrl || default_card}}' wx:key='index'>
6 <!-- <image class='swiper_img' src='{{item}}'> --> 19 <!-- <image class='swiper_img' src='{{item}}'> -->
7 <view class='img_top'> 20 <view class='img_top'>
@@ -21,7 +34,7 @@ @@ -21,7 +34,7 @@
21 <!-- </image> --> 34 <!-- </image> -->
22 </swiper-item> 35 </swiper-item>
23 </swiper> 36 </swiper>
24 - <view class='indicator_dots'> 37 + <view wx:if="{{imgsUrl.length > 0}}" class='indicator_dots'>
25 <block wx:for='{{imgsUrl}}' wx:key='index'> 38 <block wx:for='{{imgsUrl}}' wx:key='index'>
26 <view class="dot {{ index == swipercurrent ? 'dot_active':''}}"></view> 39 <view class="dot {{ index == swipercurrent ? 'dot_active':''}}"></view>
27 </block> 40 </block>
@@ -8,7 +8,7 @@ page { @@ -8,7 +8,7 @@ page {
8 position: relative; 8 position: relative;
9 } 9 }
10 10
11 -.swiper_box { 11 +.swiper_box, .default-card {
12 width: 100%; 12 width: 100%;
13 height: 430rpx; 13 height: 430rpx;
14 padding: 30rpx; 14 padding: 30rpx;
@@ -20,7 +20,7 @@ page { @@ -20,7 +20,7 @@ page {
20 height: 370rpx; 20 height: 370rpx;
21 border-radius: 20rpx; 21 border-radius: 20rpx;
22 overflow: hidden; 22 overflow: hidden;
23 - background-image: url('http://science.w.bronet.cn/static/images/background.png'); 23 + background-image: url('http://science.w.bronet.cn/static/images/card.png');
24 background-repeat: no-repeat; 24 background-repeat: no-repeat;
25 -webkit-background-size: 100%; 25 -webkit-background-size: 100%;
26 background-size: 100%; 26 background-size: 100%;