miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 a05a0cfa95182e0a2dd56846467fe2ab7ae8c173 1 个父辈 c02d6369

申诉，打卡，编辑删除学员，更换手机号

内嵌 并排对比
正在显示 21 个修改的文件 包含 1046 行增加 和 476 行删除
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="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市"> 4 + <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid">
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$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />
7 - <change beforePath="$PROJECT_DIR$/app.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/app.wxss" afterDir="false" />  
8 <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.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" />
9 - <change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" afterDir="false" />  
10 - <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" />  
11 - <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" />  
12 - <change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" afterDir="false" />  
13 - <change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" afterDir="false" />  
14 - <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" />  
15 - <change beforePath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" afterDir="false" /> 8 + <change beforePath="$PROJECT_DIR$/pages/clock/clock.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxml" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" afterDir="false" />
16 <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/index/index.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.js" afterDir="false" />
  13 + <change beforePath="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" afterDir="false" />
17 <change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" afterDir="false" /> 14 <change beforePath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" afterDir="false" />
18 <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" /> 15 <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" />
19 - <change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" afterDir="false" />  
20 - <change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml" afterDir="false" />  
21 - <change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" afterDir="false" />  
22 - <change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" /> 16 + <change beforePath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js" afterDir="false" />
  17 + <change beforePath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" afterDir="false" />
  18 + <change beforePath="$PROJECT_DIR$/pages/my/my.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.js" afterDir="false" />
  19 + <change beforePath="$PROJECT_DIR$/pages/my/my.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.wxml" afterDir="false" />
  20 + <change beforePath="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" afterDir="false" />
  21 + <change beforePath="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml" afterDir="false" />
23 </list> 22 </list>
24 <ignored path="$PROJECT_DIR$/.tmp/" /> 23 <ignored path="$PROJECT_DIR$/.tmp/" />
25 <ignored path="$PROJECT_DIR$/temp/" /> 24 <ignored path="$PROJECT_DIR$/temp/" />
@@ -34,44 +33,45 @@ @@ -34,44 +33,45 @@
34 <session id="-381596063"> 33 <session id="-381596063">
35 <usages-collector id="statistics.lifecycle.project"> 34 <usages-collector id="statistics.lifecycle.project">
36 <counts> 35 <counts>
37 - <entry key="project.closed" value="7" /> 36 + <entry key="project.closed" value="8" />
38 <entry key="project.open.time.0" value="5" /> 37 <entry key="project.open.time.0" value="5" />
39 <entry key="project.open.time.1" value="3" /> 38 <entry key="project.open.time.1" value="3" />
40 - <entry key="project.opened" value="8" /> 39 + <entry key="project.open.time.2" value="1" />
  40 + <entry key="project.opened" value="9" />
41 </counts> 41 </counts>
42 </usages-collector> 42 </usages-collector>
43 <usages-collector id="statistics.file.extensions.open"> 43 <usages-collector id="statistics.file.extensions.open">
44 <counts> 44 <counts>
45 - <entry key="js" value="38" />  
46 - <entry key="json" value="14" />  
47 - <entry key="wxml" value="34" />  
48 - <entry key="wxss" value="13" /> 45 + <entry key="js" value="52" />
  46 + <entry key="json" value="18" />
  47 + <entry key="wxml" value="46" />
  48 + <entry key="wxss" value="15" />
49 </counts> 49 </counts>
50 </usages-collector> 50 </usages-collector>
51 <usages-collector id="statistics.file.types.open"> 51 <usages-collector id="statistics.file.types.open">
52 <counts> 52 <counts>
53 - <entry key="CSS" value="13" />  
54 - <entry key="HTML" value="34" />  
55 - <entry key="JSON" value="14" />  
56 - <entry key="JavaScript" value="38" /> 53 + <entry key="CSS" value="15" />
  54 + <entry key="HTML" value="46" />
  55 + <entry key="JSON" value="18" />
  56 + <entry key="JavaScript" value="52" />
57 </counts> 57 </counts>
58 </usages-collector> 58 </usages-collector>
59 <usages-collector id="statistics.file.extensions.edit"> 59 <usages-collector id="statistics.file.extensions.edit">
60 <counts> 60 <counts>
61 - <entry key="js" value="4356" />  
62 - <entry key="json" value="117" />  
63 - <entry key="txt" value="89" />  
64 - <entry key="wxml" value="973" />  
65 - <entry key="wxss" value="742" /> 61 + <entry key="js" value="7079" />
  62 + <entry key="json" value="119" />
  63 + <entry key="txt" value="144" />
  64 + <entry key="wxml" value="1482" />
  65 + <entry key="wxss" value="805" />
66 </counts> 66 </counts>
67 </usages-collector> 67 </usages-collector>
68 <usages-collector id="statistics.file.types.edit"> 68 <usages-collector id="statistics.file.types.edit">
69 <counts> 69 <counts>
70 - <entry key="CSS" value="742" />  
71 - <entry key="HTML" value="973" />  
72 - <entry key="JSON" value="117" />  
73 - <entry key="JavaScript" value="4356" />  
74 - <entry key="PLAIN_TEXT" value="89" /> 70 + <entry key="CSS" value="805" />
  71 + <entry key="HTML" value="1482" />
  72 + <entry key="JSON" value="119" />
  73 + <entry key="JavaScript" value="7079" />
  74 + <entry key="PLAIN_TEXT" value="144" />
75 </counts> 75 </counts>
76 </usages-collector> 76 </usages-collector>
77 </session> 77 </session>
@@ -79,94 +79,86 @@ @@ -79,94 +79,86 @@
79 <component name="FileEditorManager"> 79 <component name="FileEditorManager">
80 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 80 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
81 <file pinned="false" current-in-tab="false"> 81 <file pinned="false" current-in-tab="false">
82 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js"> 82 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
83 <provider selected="true" editor-type-id="text-editor"> 83 <provider selected="true" editor-type-id="text-editor">
84 - <state relative-caret-position="498">  
85 - <caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" /> 84 + <state relative-caret-position="30">
  85 + <caret line="10" column="34" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="34" />
86 </state> 86 </state>
87 </provider> 87 </provider>
88 </entry> 88 </entry>
89 </file> 89 </file>
90 <file pinned="false" current-in-tab="false"> 90 <file pinned="false" current-in-tab="false">
91 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js"> 91 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js">
92 <provider selected="true" editor-type-id="text-editor"> 92 <provider selected="true" editor-type-id="text-editor">
93 - <state relative-caret-position="333">  
94 - <caret line="41" column="16" lean-forward="true" selection-start-line="41" selection-start-column="16" selection-end-line="51" selection-end-column="18" /> 93 + <state relative-caret-position="654">
  94 + <caret line="99" column="61" lean-forward="true" selection-start-line="99" selection-start-column="61" selection-end-line="99" selection-end-column="61" />
95 </state> 95 </state>
96 </provider> 96 </provider>
97 </entry> 97 </entry>
98 </file> 98 </file>
99 <file pinned="false" current-in-tab="false"> 99 <file pinned="false" current-in-tab="false">
100 - <entry file="file://$PROJECT_DIR$/pages/index/index.js"> 100 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
101 <provider selected="true" editor-type-id="text-editor"> 101 <provider selected="true" editor-type-id="text-editor">
102 - <state relative-caret-position="586">  
103 - <caret line="58" column="62" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="62" />  
104 - <folding>  
105 - <element signature="n#!!doc" expanded="true" />  
106 - </folding> 102 + <state relative-caret-position="308">
  103 + <caret line="14" column="34" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="34" />
107 </state> 104 </state>
108 </provider> 105 </provider>
109 </entry> 106 </entry>
110 </file> 107 </file>
111 - <file pinned="false" current-in-tab="false">  
112 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml"> 108 + <file pinned="false" current-in-tab="true">
  109 + <entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js">
113 <provider selected="true" editor-type-id="text-editor"> 110 <provider selected="true" editor-type-id="text-editor">
114 - <state relative-caret-position="286">  
115 - <caret line="13" column="99" lean-forward="true" selection-start-line="13" selection-start-column="99" selection-end-line="13" selection-end-column="99" /> 111 + <state relative-caret-position="726">
  112 + <caret line="120" column="37" selection-start-line="120" selection-start-column="37" selection-end-line="120" selection-end-column="37" />
116 </state> 113 </state>
117 </provider> 114 </provider>
118 </entry> 115 </entry>
119 </file> 116 </file>
120 - <file pinned="false" current-in-tab="true">  
121 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">  
122 - <provider selected="true" editor-type-id="text-editor">  
123 - <state relative-caret-position="660">  
124 - <caret line="39" column="6" lean-forward="true" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" />  
125 - </state>  
126 - </provider> 117 + <file pinned="false" current-in-tab="false">
  118 + <entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.json">
  119 + <provider selected="true" editor-type-id="text-editor" />
127 </entry> 120 </entry>
128 </file> 121 </file>
129 <file pinned="false" current-in-tab="false"> 122 <file pinned="false" current-in-tab="false">
130 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml"> 123 + <entry file="file://$PROJECT_DIR$/app.js">
131 <provider selected="true" editor-type-id="text-editor"> 124 <provider selected="true" editor-type-id="text-editor">
132 - <state relative-caret-position="1364">  
133 - <caret line="62" selection-start-line="62" selection-end-line="62" /> 125 + <state relative-caret-position="256">
  126 + <caret line="127" column="11" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="11" />
134 </state> 127 </state>
135 </provider> 128 </provider>
136 </entry> 129 </entry>
137 </file> 130 </file>
138 <file pinned="false" current-in-tab="false"> 131 <file pinned="false" current-in-tab="false">
139 - <entry file="file://$PROJECT_DIR$/app.json">  
140 - <provider selected="true" editor-type-id="text-editor">  
141 - <state relative-caret-position="88">  
142 - <caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />  
143 - </state>  
144 - </provider> 132 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.json">
  133 + <provider selected="true" editor-type-id="text-editor" />
145 </entry> 134 </entry>
146 </file> 135 </file>
147 <file pinned="false" current-in-tab="false"> 136 <file pinned="false" current-in-tab="false">
148 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss"> 137 + <entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml">
149 <provider selected="true" editor-type-id="text-editor"> 138 <provider selected="true" editor-type-id="text-editor">
150 - <state relative-caret-position="806">  
151 - <caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" /> 139 + <state relative-caret-position="638">
  140 + <caret line="29" column="23" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="23" />
152 </state> 141 </state>
153 </provider> 142 </provider>
154 </entry> 143 </entry>
155 </file> 144 </file>
156 <file pinned="false" current-in-tab="false"> 145 <file pinned="false" current-in-tab="false">
157 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss"> 146 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
158 <provider selected="true" editor-type-id="text-editor"> 147 <provider selected="true" editor-type-id="text-editor">
159 - <state relative-caret-position="308">  
160 - <caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" /> 148 + <state relative-caret-position="369">
  149 + <caret line="65" selection-start-line="65" selection-end-line="104" selection-end-column="6" />
  150 + <folding>
  151 + <element signature="e#1785#3272#0" />
  152 + </folding>
161 </state> 153 </state>
162 </provider> 154 </provider>
163 </entry> 155 </entry>
164 </file> 156 </file>
165 <file pinned="false" current-in-tab="false"> 157 <file pinned="false" current-in-tab="false">
166 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json"> 158 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
167 <provider selected="true" editor-type-id="text-editor"> 159 <provider selected="true" editor-type-id="text-editor">
168 - <state relative-caret-position="22">  
169 - <caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" /> 160 + <state relative-caret-position="330">
  161 + <caret line="15" column="25" lean-forward="true" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
170 </state> 162 </state>
171 </provider> 163 </provider>
172 </entry> 164 </entry>
@@ -175,13 +167,6 @@ @@ -175,13 +167,6 @@
175 </component> 167 </component>
176 <component name="FindInProjectRecents"> 168 <component name="FindInProjectRecents">
177 <findStrings> 169 <findStrings>
178 - <find>show_submit_btn</find>  
179 - <find>current_test_id</find>  
180 - <find>experiment_id</find>  
181 - <find>chil</find>  
182 - <find>bindPickerChange</find>  
183 - <find>check-box</find>  
184 - <find>form</find>  
185 <find>skin</find> 170 <find>skin</find>
186 <find>verification_code</find> 171 <find>verification_code</find>
187 <find>add</find> 172 <find>add</find>
@@ -205,6 +190,13 @@ @@ -205,6 +190,13 @@
205 <find>@import</find> 190 <find>@import</find>
206 <find>tips</find> 191 <find>tips</find>
207 <find>changeStudent</find> 192 <find>changeStudent</find>
  193 + <find>getLocation</find>
  194 + <find>punchState</find>
  195 + <find>upload_item</find>
  196 + <find>tempFilePaths</find>
  197 + <find>is_bingding</find>
  198 + <find>punch</find>
  199 + <find>checkMobile</find>
208 </findStrings> 200 </findStrings>
209 </component> 201 </component>
210 <component name="Git.Settings"> 202 <component name="Git.Settings">
@@ -218,25 +210,20 @@ @@ -218,25 +210,20 @@
218 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" /> 210 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js" />
219 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" /> 211 <option value="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml" />
220 <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml" /> 212 <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml" />
221 - <option value="$PROJECT_DIR$/pages/my/my.js" />  
222 <option value="$PROJECT_DIR$/pages/my/protocol/protocol.js" /> 213 <option value="$PROJECT_DIR$/pages/my/protocol/protocol.js" />
223 <option value="$PROJECT_DIR$/pages/my/protocol/protocol.wxml" /> 214 <option value="$PROJECT_DIR$/pages/my/protocol/protocol.wxml" />
224 - <option value="$PROJECT_DIR$/pages/my/my.wxml" />  
225 <option value="$PROJECT_DIR$/pages/my/my.wxss" /> 215 <option value="$PROJECT_DIR$/pages/my/my.wxss" />
226 <option value="$PROJECT_DIR$/pages/start/start.js" /> 216 <option value="$PROJECT_DIR$/pages/start/start.js" />
227 <option value="$PROJECT_DIR$/utils/util.js" /> 217 <option value="$PROJECT_DIR$/utils/util.js" />
228 <option value="$PROJECT_DIR$/app.js" /> 218 <option value="$PROJECT_DIR$/app.js" />
229 - <option value="$PROJECT_DIR$/pages/clock/clock.wxml" />  
230 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" /> 219 <option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
231 <option value="$PROJECT_DIR$/project.config.json" /> 220 <option value="$PROJECT_DIR$/project.config.json" />
232 - <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />  
233 <option value="$PROJECT_DIR$/pages/index/index.wxml" /> 221 <option value="$PROJECT_DIR$/pages/index/index.wxml" />
234 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" /> 222 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
235 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" /> 223 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
236 <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" /> 224 <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" />
237 <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" /> 225 <option value="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml" />
238 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" /> 226 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
239 - <option value="$PROJECT_DIR$/pages/clock/clock.js" />  
240 <option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" /> 227 <option value="$PROJECT_DIR$/pages/my/charge/charge.wxss" />
241 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" /> 228 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
242 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" /> 229 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" />
@@ -244,14 +231,30 @@ @@ -244,14 +231,30 @@
244 <option value="$PROJECT_DIR$/app.wxss" /> 231 <option value="$PROJECT_DIR$/app.wxss" />
245 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" /> 232 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss" />
246 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.json" /> 233 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.json" />
247 - <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />  
248 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" /> 234 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" />
249 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" /> 235 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss" />
250 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" /> 236 <option value="$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml" />
251 <option value="$PROJECT_DIR$/app.json" /> 237 <option value="$PROJECT_DIR$/app.json" />
252 - <option value="$PROJECT_DIR$/pages/index/index.js" />  
253 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" /> 238 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
254 <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" /> 239 <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js" />
  240 + <option value="$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml" />
  241 + <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" />
  242 + <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
  243 + <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
  244 + <option value="$PROJECT_DIR$/pages/my/my.wxml" />
  245 + <option value="$PROJECT_DIR$/pages/index/index.js" />
  246 + <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
  247 + <option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
  248 + <option value="$PROJECT_DIR$/pages/clock/clock.js" />
  249 + <option value="$PROJECT_DIR$/pages/my/my.js" />
  250 + <option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.json" />
  251 + <option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml" />
  252 + <option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.wxss" />
  253 + <option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.js" />
  254 + <option value="$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml" />
  255 + <option value="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" />
  256 + <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" />
  257 + <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js" />
255 </list> 258 </list>
256 </option> 259 </option>
257 </component> 260 </component>
@@ -272,6 +275,7 @@ @@ -272,6 +275,7 @@
272 <foldersAlwaysOnTop value="true" /> 275 <foldersAlwaysOnTop value="true" />
273 </navigator> 276 </navigator>
274 <panes> 277 <panes>
  278 + <pane id="Scope" />
275 <pane id="ProjectPane"> 279 <pane id="ProjectPane">
276 <subPane> 280 <subPane>
277 <expand> 281 <expand>
@@ -288,12 +292,6 @@ @@ -288,12 +292,6 @@
288 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 292 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
289 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 293 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
290 <item name="pages" type="462c0819:PsiDirectoryNode" /> 294 <item name="pages" type="462c0819:PsiDirectoryNode" />
291 - <item name="clock" type="462c0819:PsiDirectoryNode" />  
292 - </path>  
293 - <path>  
294 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
295 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
296 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
297 <item name="index" type="462c0819:PsiDirectoryNode" /> 295 <item name="index" type="462c0819:PsiDirectoryNode" />
298 </path> 296 </path>
299 <path> 297 <path>
@@ -316,13 +314,6 @@ @@ -316,13 +314,6 @@
316 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 314 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
317 <item name="pages" type="462c0819:PsiDirectoryNode" /> 315 <item name="pages" type="462c0819:PsiDirectoryNode" />
318 <item name="index" type="462c0819:PsiDirectoryNode" /> 316 <item name="index" type="462c0819:PsiDirectoryNode" />
319 - <item name="go-appointment" type="462c0819:PsiDirectoryNode" />  
320 - </path>  
321 - <path>  
322 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
323 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
324 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
325 - <item name="index" type="462c0819:PsiDirectoryNode" />  
326 <item name="phone-code" type="462c0819:PsiDirectoryNode" /> 317 <item name="phone-code" type="462c0819:PsiDirectoryNode" />
327 </path> 318 </path>
328 <path> 319 <path>
@@ -336,21 +327,14 @@ @@ -336,21 +327,14 @@
336 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 327 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
337 <item name="pages" type="462c0819:PsiDirectoryNode" /> 328 <item name="pages" type="462c0819:PsiDirectoryNode" />
338 <item name="my" type="462c0819:PsiDirectoryNode" /> 329 <item name="my" type="462c0819:PsiDirectoryNode" />
339 - <item name="all-appointment" type="462c0819:PsiDirectoryNode" /> 330 + <item name="chargePhoneNum" type="462c0819:PsiDirectoryNode" />
340 </path> 331 </path>
341 <path> 332 <path>
342 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 333 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
343 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 334 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
344 <item name="pages" type="462c0819:PsiDirectoryNode" /> 335 <item name="pages" type="462c0819:PsiDirectoryNode" />
345 <item name="my" type="462c0819:PsiDirectoryNode" /> 336 <item name="my" type="462c0819:PsiDirectoryNode" />
346 - <item name="buyCard" type="462c0819:PsiDirectoryNode" />  
347 - </path>  
348 - <path>  
349 - <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />  
350 - <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />  
351 - <item name="pages" type="462c0819:PsiDirectoryNode" />  
352 - <item name="my" type="462c0819:PsiDirectoryNode" />  
353 - <item name="charge" type="462c0819:PsiDirectoryNode" /> 337 + <item name="myProfile" type="462c0819:PsiDirectoryNode" />
354 </path> 338 </path>
355 <path> 339 <path>
356 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 340 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
@@ -379,12 +363,11 @@ @@ -379,12 +363,11 @@
379 <select /> 363 <select />
380 </subPane> 364 </subPane>
381 </pane> 365 </pane>
382 - <pane id="Scope" />  
383 </panes> 366 </panes>
384 </component> 367 </component>
385 <component name="PropertiesComponent"> 368 <component name="PropertiesComponent">
386 <property name="WebServerToolWindowFactoryState" value="false" /> 369 <property name="WebServerToolWindowFactoryState" value="false" />
387 - <property name="last_opened_file_path" value="D:/project/life" /> 370 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
388 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 371 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
389 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 372 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
390 <property name="settings.editor.selected.configurable" value="project.propDebugger" /> 373 <property name="settings.editor.selected.configurable" value="project.propDebugger" />
@@ -425,7 +408,8 @@ @@ -425,7 +408,8 @@
425 <workItem from="1543403978629" duration="164000" /> 408 <workItem from="1543403978629" duration="164000" />
426 <workItem from="1543975238201" duration="27150000" /> 409 <workItem from="1543975238201" duration="27150000" />
427 <workItem from="1544059385784" duration="3563000" /> 410 <workItem from="1544059385784" duration="3563000" />
428 - <workItem from="1544062971616" duration="13337000" /> 411 + <workItem from="1544062971616" duration="25513000" />
  412 + <workItem from="1544145384377" duration="6854000" />
429 </task> 413 </task>
430 <task id="LOCAL-00001" summary="modal 模板"> 414 <task id="LOCAL-00001" summary="modal 模板">
431 <created>1542274356914</created> 415 <created>1542274356914</created>
@@ -455,11 +439,18 @@ @@ -455,11 +439,18 @@
455 <option name="project" value="LOCAL" /> 439 <option name="project" value="LOCAL" />
456 <updated>1543978774318</updated> 440 <updated>1543978774318</updated>
457 </task> 441 </task>
458 - <option name="localTasksCounter" value="5" /> 442 + <task id="LOCAL-00005" summary="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid">
  443 + <created>1544079539745</created>
  444 + <option name="number" value="00005" />
  445 + <option name="presentableId" value="LOCAL-00005" />
  446 + <option name="project" value="LOCAL" />
  447 + <updated>1544079539745</updated>
  448 + </task>
  449 + <option name="localTasksCounter" value="6" />
459 <servers /> 450 <servers />
460 </component> 451 </component>
461 <component name="TimeTrackingManager"> 452 <component name="TimeTrackingManager">
462 - <option name="totallyTimeSpent" value="62671000" /> 453 + <option name="totallyTimeSpent" value="81701000" />
463 </component> 454 </component>
464 <component name="ToolWindowManager"> 455 <component name="ToolWindowManager">
465 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 456 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -521,357 +512,361 @@ @@ -521,357 +512,361 @@
521 <MESSAGE value="上传到远程wumengyu" /> 512 <MESSAGE value="上传到远程wumengyu" />
522 <MESSAGE value="登录注册，绑定手机号，获取验证码，轮播图，本周实验，往期实验，立即预约，实验详情" /> 513 <MESSAGE value="登录注册，绑定手机号，获取验证码，轮播图，本周实验，往期实验，立即预约，实验详情" />
523 <MESSAGE value="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市" /> 514 <MESSAGE value="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市" />
524 - <option name="LAST_COMMIT_MESSAGE" value="更换appid和密钥，添加绑定手机后跳转到首页隐藏蒙层，添加解析文件，优化去预约显示的城市" /> 515 + <MESSAGE value="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid" />
  516 + <option name="LAST_COMMIT_MESSAGE" value="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid" />
525 </component> 517 </component>
526 <component name="editorHistoryManager"> 518 <component name="editorHistoryManager">
527 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">  
528 - <provider selected="true" editor-type-id="text-editor" />  
529 - </entry>  
530 - <entry file="file://$PROJECT_DIR$/templates/templates.wxss"> 519 + <entry file="file://$PROJECT_DIR$/utils/util.js">
531 <provider selected="true" editor-type-id="text-editor"> 520 <provider selected="true" editor-type-id="text-editor">
532 - <state>  
533 - <caret column="34" selection-start-column="34" selection-end-column="34" /> 521 + <state relative-caret-position="286">
  522 + <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" />
534 </state> 523 </state>
535 </provider> 524 </provider>
536 </entry> 525 </entry>
537 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxss"> 526 + <entry file="file://$PROJECT_DIR$/utils/qqmap-wx-jssdk.min.js">
538 <provider selected="true" editor-type-id="text-editor"> 527 <provider selected="true" editor-type-id="text-editor">
539 - <state relative-caret-position="924">  
540 - <caret line="42" selection-start-line="42" selection-end-line="59" selection-end-column="1" /> 528 + <state relative-caret-position="22">
  529 + <caret line="1" column="110" lean-forward="true" selection-start-line="1" selection-start-column="110" selection-end-line="1" selection-end-column="110" />
541 </state> 530 </state>
542 </provider> 531 </provider>
543 </entry> 532 </entry>
544 - <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">  
545 - <provider selected="true" editor-type-id="text-editor" />  
546 - </entry>  
547 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.json"> 533 + <entry file="file://$PROJECT_DIR$/project.config.json">
548 <provider selected="true" editor-type-id="text-editor"> 534 <provider selected="true" editor-type-id="text-editor">
549 - <state relative-caret-position="44">  
550 - <caret line="2" column="1" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" /> 535 + <state relative-caret-position="308">
  536 + <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" />
551 </state> 537 </state>
552 </provider> 538 </provider>
553 </entry> 539 </entry>
554 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxss"> 540 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
555 <provider selected="true" editor-type-id="text-editor"> 541 <provider selected="true" editor-type-id="text-editor">
556 - <state relative-caret-position="154">  
557 - <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" /> 542 + <state relative-caret-position="462">
  543 + <caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" />
558 </state> 544 </state>
559 </provider> 545 </provider>
560 </entry> 546 </entry>
561 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.json">  
562 - <provider selected="true" editor-type-id="text-editor" />  
563 - </entry>  
564 - <entry file="file://$PROJECT_DIR$/pages/start/start.wxml"> 547 + <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.json">
565 <provider selected="true" editor-type-id="text-editor"> 548 <provider selected="true" editor-type-id="text-editor">
566 - <state relative-caret-position="132">  
567 - <caret line="6" column="15" lean-forward="true" selection-start-line="6" selection-start-column="15" selection-end-line="6" selection-end-column="15" /> 549 + <state relative-caret-position="22">
  550 + <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" />
568 </state> 551 </state>
569 </provider> 552 </provider>
570 </entry> 553 </entry>
571 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml"> 554 + <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
572 <provider selected="true" editor-type-id="text-editor"> 555 <provider selected="true" editor-type-id="text-editor">
573 - <state relative-caret-position="220">  
574 - <caret line="10" column="34" selection-start-line="10" selection-start-column="34" selection-end-line="10" selection-end-column="34" /> 556 + <state relative-caret-position="1254">
  557 + <caret line="57" column="43" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="43" />
575 </state> 558 </state>
576 </provider> 559 </provider>
577 </entry> 560 </entry>
578 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json">  
579 - <provider selected="true" editor-type-id="text-editor" />  
580 - </entry>  
581 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js"> 561 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss">
582 <provider selected="true" editor-type-id="text-editor"> 562 <provider selected="true" editor-type-id="text-editor">
583 - <state relative-caret-position="66">  
584 - <caret line="10" column="25" lean-forward="true" selection-start-line="10" selection-start-column="25" selection-end-line="10" selection-end-column="25" /> 563 + <state relative-caret-position="330">
  564 + <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" />
585 </state> 565 </state>
586 </provider> 566 </provider>
587 </entry> 567 </entry>
588 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml"> 568 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
589 <provider selected="true" editor-type-id="text-editor"> 569 <provider selected="true" editor-type-id="text-editor">
590 - <state relative-caret-position="88">  
591 - <caret line="4" column="7" lean-forward="true" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="7" /> 570 + <state relative-caret-position="1314">
  571 + <caret line="60" column="15" lean-forward="true" selection-start-line="60" selection-start-column="15" selection-end-line="60" selection-end-column="15" />
592 </state> 572 </state>
593 </provider> 573 </provider>
594 </entry> 574 </entry>
595 - <entry file="file://$PROJECT_DIR$/pages/my/my.js"> 575 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
596 <provider selected="true" editor-type-id="text-editor"> 576 <provider selected="true" editor-type-id="text-editor">
597 - <state relative-caret-position="396">  
598 - <caret line="22" column="41" lean-forward="true" selection-start-line="22" selection-start-column="41" selection-end-line="22" selection-end-column="41" /> 577 + <state relative-caret-position="852">
  578 + <caret line="227" selection-start-line="227" selection-end-line="245" selection-end-column="8" />
599 </state> 579 </state>
600 </provider> 580 </provider>
601 </entry> 581 </entry>
602 - <entry file="file://$PROJECT_DIR$/pages/my/my.wxml"> 582 + <entry file="file://$PROJECT_DIR$/app.wxss">
603 <provider selected="true" editor-type-id="text-editor"> 583 <provider selected="true" editor-type-id="text-editor">
604 - <state relative-caret-position="264">  
605 - <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" /> 584 + <state relative-caret-position="1188">
  585 + <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" />
606 </state> 586 </state>
607 </provider> 587 </provider>
608 </entry> 588 </entry>
609 - <entry file="file://$PROJECT_DIR$/pages/my/my.wxss"> 589 + <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss">
610 <provider selected="true" editor-type-id="text-editor"> 590 <provider selected="true" editor-type-id="text-editor">
611 - <state relative-caret-position="242">  
612 - <caret line="11" column="33" lean-forward="true" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="33" /> 591 + <state relative-caret-position="533">
  592 + <caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" />
613 </state> 593 </state>
614 </provider> 594 </provider>
615 </entry> 595 </entry>
616 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss"> 596 + <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml">
617 <provider selected="true" editor-type-id="text-editor"> 597 <provider selected="true" editor-type-id="text-editor">
618 - <state relative-caret-position="198">  
619 - <caret line="9" column="16" selection-start-line="9" selection-start-column="16" selection-end-line="9" selection-end-column="16" /> 598 + <state relative-caret-position="522">
  599 + <caret line="30" column="40" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="40" />
620 </state> 600 </state>
621 </provider> 601 </provider>
622 </entry> 602 </entry>
623 - <entry file="file://$PROJECT_DIR$/utils/util.js"> 603 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
624 <provider selected="true" editor-type-id="text-editor"> 604 <provider selected="true" editor-type-id="text-editor">
625 - <state relative-caret-position="286">  
626 - <caret line="13" column="27" selection-start-line="13" selection-start-column="27" selection-end-line="13" selection-end-column="27" /> 605 + <state relative-caret-position="674">
  606 + <caret line="35" column="64" selection-end-line="62" selection-end-column="7" />
627 </state> 607 </state>
628 </provider> 608 </provider>
629 </entry> 609 </entry>
630 - <entry file="file://$PROJECT_DIR$/utils/qqmap-wx-jssdk.min.js"> 610 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.json">
631 <provider selected="true" editor-type-id="text-editor"> 611 <provider selected="true" editor-type-id="text-editor">
632 - <state relative-caret-position="22">  
633 - <caret line="1" column="110" lean-forward="true" selection-start-line="1" selection-start-column="110" selection-end-line="1" selection-end-column="110" /> 612 + <state>
  613 + <caret selection-end-line="2" selection-end-column="1" />
634 </state> 614 </state>
635 </provider> 615 </provider>
636 </entry> 616 </entry>
637 - <entry file="file://$PROJECT_DIR$/pages/start/start.js"> 617 + <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
638 <provider selected="true" editor-type-id="text-editor"> 618 <provider selected="true" editor-type-id="text-editor">
639 - <state relative-caret-position="1166">  
640 - <caret line="53" column="31" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" /> 619 + <state relative-caret-position="498">
  620 + <caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" />
641 </state> 621 </state>
642 </provider> 622 </provider>
643 </entry> 623 </entry>
644 - <entry file="file://$PROJECT_DIR$/project.config.json"> 624 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
645 <provider selected="true" editor-type-id="text-editor"> 625 <provider selected="true" editor-type-id="text-editor">
646 <state relative-caret-position="308"> 626 <state relative-caret-position="308">
647 - <caret line="14" column="32" selection-start-line="14" selection-start-column="32" selection-end-line="14" selection-end-column="32" /> 627 + <caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" />
648 </state> 628 </state>
649 </provider> 629 </provider>
650 </entry> 630 </entry>
651 - <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js"> 631 + <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json">
652 <provider selected="true" editor-type-id="text-editor"> 632 <provider selected="true" editor-type-id="text-editor">
653 - <state relative-caret-position="462">  
654 - <caret line="21" column="22" selection-start-line="21" selection-start-column="22" selection-end-line="21" selection-end-column="22" /> 633 + <state relative-caret-position="22">
  634 + <caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" />
655 </state> 635 </state>
656 </provider> 636 </provider>
657 </entry> 637 </entry>
658 - <entry file="file://$PROJECT_DIR$/app.js"> 638 + <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss">
659 <provider selected="true" editor-type-id="text-editor"> 639 <provider selected="true" editor-type-id="text-editor">
660 - <state relative-caret-position="278">  
661 - <caret line="137" column="38" lean-forward="true" selection-start-line="140" selection-start-column="4" selection-end-line="140" selection-end-column="12" /> 640 + <state relative-caret-position="806">
  641 + <caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" />
662 </state> 642 </state>
663 </provider> 643 </provider>
664 </entry> 644 </entry>
665 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.json">  
666 - <provider selected="true" editor-type-id="text-editor" />  
667 - </entry>  
668 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js"> 645 + <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml">
669 <provider selected="true" editor-type-id="text-editor"> 646 <provider selected="true" editor-type-id="text-editor">
670 - <state relative-caret-position="1694">  
671 - <caret line="77" column="39" selection-start-line="77" selection-start-column="33" selection-end-line="77" selection-end-column="39" /> 647 + <state relative-caret-position="1364">
  648 + <caret line="62" selection-start-line="62" selection-end-line="62" />
672 </state> 649 </state>
673 </provider> 650 </provider>
674 </entry> 651 </entry>
675 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml"> 652 + <entry file="file://$PROJECT_DIR$/app.json">
676 <provider selected="true" editor-type-id="text-editor"> 653 <provider selected="true" editor-type-id="text-editor">
677 - <state relative-caret-position="396">  
678 - <caret line="18" column="19" lean-forward="true" selection-start-line="18" selection-start-column="19" selection-end-line="18" selection-end-column="19" /> 654 + <state relative-caret-position="88">
  655 + <caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
679 </state> 656 </state>
680 </provider> 657 </provider>
681 </entry> 658 </entry>
682 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml"> 659 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
683 <provider selected="true" editor-type-id="text-editor"> 660 <provider selected="true" editor-type-id="text-editor">
684 - <state relative-caret-position="242">  
685 - <caret line="11" column="115" selection-start-line="11" selection-start-column="98" selection-end-line="11" selection-end-column="115" /> 661 + <state relative-caret-position="630">
  662 + <caret line="37" column="41" selection-start-line="37" selection-start-column="41" selection-end-line="37" selection-end-column="41" />
686 </state> 663 </state>
687 </provider> 664 </provider>
688 </entry> 665 </entry>
689 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.json"> 666 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
690 <provider selected="true" editor-type-id="text-editor"> 667 <provider selected="true" editor-type-id="text-editor">
691 - <state relative-caret-position="22">  
692 - <caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="29" /> 668 + <state relative-caret-position="499">
  669 + <caret line="104" column="15" selection-start-line="104" selection-start-column="15" selection-end-line="104" selection-end-column="15" />
693 </state> 670 </state>
694 </provider> 671 </provider>
695 </entry> 672 </entry>
696 - <entry file="file://$PROJECT_DIR$/templates/templates.wxml"> 673 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
697 <provider selected="true" editor-type-id="text-editor"> 674 <provider selected="true" editor-type-id="text-editor">
698 - <state relative-caret-position="1254">  
699 - <caret line="57" column="43" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="43" /> 675 + <state relative-caret-position="698">
  676 + <caret line="50" column="27" lean-forward="true" selection-start-line="50" selection-start-column="27" selection-end-line="50" selection-end-column="27" />
700 </state> 677 </state>
701 </provider> 678 </provider>
702 </entry> 679 </entry>
703 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml"> 680 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
704 <provider selected="true" editor-type-id="text-editor"> 681 <provider selected="true" editor-type-id="text-editor">
705 - <state relative-caret-position="396">  
706 - <caret line="27" column="44" selection-start-line="27" selection-start-column="35" selection-end-line="27" selection-end-column="44" /> 682 + <state relative-caret-position="506">
  683 + <caret line="104" column="37" lean-forward="true" selection-start-line="104" selection-start-column="37" selection-end-line="104" selection-end-column="37" />
707 </state> 684 </state>
708 </provider> 685 </provider>
709 </entry> 686 </entry>
710 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml"> 687 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
711 <provider selected="true" editor-type-id="text-editor"> 688 <provider selected="true" editor-type-id="text-editor">
712 - <state relative-caret-position="220">  
713 - <caret line="10" column="11" selection-start-line="10" selection-start-column="11" selection-end-line="10" selection-end-column="11" /> 689 + <state relative-caret-position="66">
  690 + <caret line="3" column="45" selection-start-line="3" selection-start-column="34" selection-end-line="3" selection-end-column="45" />
714 </state> 691 </state>
715 </provider> 692 </provider>
716 </entry> 693 </entry>
717 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.js"> 694 + <entry file="file://$PROJECT_DIR$/pages/start/start.js">
718 <provider selected="true" editor-type-id="text-editor"> 695 <provider selected="true" editor-type-id="text-editor">
719 - <state relative-caret-position="572">  
720 - <caret line="107" column="26" lean-forward="true" selection-start-line="107" selection-start-column="26" selection-end-line="107" selection-end-column="26" /> 696 + <state relative-caret-position="1116">
  697 + <caret line="53" column="31" selection-start-line="53" selection-start-column="31" selection-end-line="53" selection-end-column="31" />
721 </state> 698 </state>
722 </provider> 699 </provider>
723 </entry> 700 </entry>
724 - <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxss"> 701 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
725 <provider selected="true" editor-type-id="text-editor"> 702 <provider selected="true" editor-type-id="text-editor">
726 - <state relative-caret-position="330">  
727 - <caret line="15" column="35" selection-start-line="15" selection-start-column="35" selection-end-line="15" selection-end-column="35" /> 703 + <state relative-caret-position="1496">
  704 + <caret line="68" column="61" selection-start-line="68" selection-start-column="61" selection-end-line="68" selection-end-column="61" />
728 </state> 705 </state>
729 </provider> 706 </provider>
730 </entry> 707 </entry>
731 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml"> 708 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
732 <provider selected="true" editor-type-id="text-editor"> 709 <provider selected="true" editor-type-id="text-editor">
733 - <state relative-caret-position="1314">  
734 - <caret line="60" column="15" lean-forward="true" selection-start-line="60" selection-start-column="15" selection-end-line="60" selection-end-column="15" /> 710 + <state relative-caret-position="836">
  711 + <caret line="38" column="47" selection-start-line="38" selection-start-column="47" selection-end-line="38" selection-end-column="47" />
735 </state> 712 </state>
736 </provider> 713 </provider>
737 </entry> 714 </entry>
738 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js"> 715 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
739 <provider selected="true" editor-type-id="text-editor"> 716 <provider selected="true" editor-type-id="text-editor">
740 - <state relative-caret-position="852">  
741 - <caret line="227" selection-start-line="227" selection-end-line="245" selection-end-column="8" /> 717 + <state relative-caret-position="2662">
  718 + <caret line="122" column="24" selection-start-line="122" selection-start-column="13" selection-end-line="122" selection-end-column="24" />
742 <folding> 719 <folding>
743 - <element signature="e#401#1280#0" />  
744 - <element signature="e#402#613#0" />  
745 - <element signature="e#621#832#0" />  
746 - <element signature="e#840#1052#0" />  
747 - <element signature="e#1060#1273#0" />  
748 - <element signature="e#1292#2413#0" /> 720 + <element signature="n#!!doc" expanded="true" />
749 </folding> 721 </folding>
750 </state> 722 </state>
751 </provider> 723 </provider>
752 </entry> 724 </entry>
753 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js"> 725 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
754 <provider selected="true" editor-type-id="text-editor"> 726 <provider selected="true" editor-type-id="text-editor">
755 - <state relative-caret-position="333">  
756 - <caret line="144" column="16" selection-start-line="144" selection-start-column="16" selection-end-line="144" selection-end-column="16" /> 727 + <state relative-caret-position="4290">
  728 + <caret line="195" column="24" selection-start-line="195" selection-start-column="24" selection-end-line="195" selection-end-column="24" />
757 </state> 729 </state>
758 </provider> 730 </provider>
759 </entry> 731 </entry>
760 - <entry file="file://$PROJECT_DIR$/app.wxss"> 732 + <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
761 <provider selected="true" editor-type-id="text-editor"> 733 <provider selected="true" editor-type-id="text-editor">
762 - <state relative-caret-position="1188">  
763 - <caret line="54" lean-forward="true" selection-start-line="54" selection-end-line="54" /> 734 + <state relative-caret-position="1870">
  735 + <caret line="118" selection-start-line="118" selection-end-line="136" selection-end-column="6" />
764 <folding> 736 <folding>
765 - <element signature="e#251#4820#1" expanded="true" /> 737 + <element signature="e#1497#2725#0" />
766 </folding> 738 </folding>
767 </state> 739 </state>
768 </provider> 740 </provider>
769 </entry> 741 </entry>
770 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxss"> 742 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
771 <provider selected="true" editor-type-id="text-editor"> 743 <provider selected="true" editor-type-id="text-editor">
772 - <state relative-caret-position="533">  
773 - <caret line="56" column="19" selection-start-line="56" selection-start-column="19" selection-end-line="56" selection-end-column="19" /> 744 + <state relative-caret-position="66">
  745 + <caret line="3" column="43" selection-start-line="3" selection-start-column="43" selection-end-line="3" selection-end-column="43" />
774 </state> 746 </state>
775 </provider> 747 </provider>
776 </entry> 748 </entry>
777 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.wxml"> 749 + <entry file="file://$PROJECT_DIR$/pages/my/my.js">
778 <provider selected="true" editor-type-id="text-editor"> 750 <provider selected="true" editor-type-id="text-editor">
779 - <state relative-caret-position="522">  
780 - <caret line="30" column="40" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="40" /> 751 + <state relative-caret-position="1738">
  752 + <caret line="79" selection-start-line="79" selection-end-line="89" selection-end-column="6" />
781 </state> 753 </state>
782 </provider> 754 </provider>
783 </entry> 755 </entry>
784 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml"> 756 + <entry file="file://$PROJECT_DIR$/pages/my/my.wxml">
785 <provider selected="true" editor-type-id="text-editor"> 757 <provider selected="true" editor-type-id="text-editor">
786 - <state relative-caret-position="674">  
787 - <caret line="35" column="64" selection-end-line="62" selection-end-column="7" /> 758 + <state relative-caret-position="66">
  759 + <caret line="3" column="76" selection-start-line="3" selection-start-column="76" selection-end-line="3" selection-end-column="76" />
788 </state> 760 </state>
789 </provider> 761 </provider>
790 </entry> 762 </entry>
791 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.json"> 763 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
  764 + <provider selected="true" editor-type-id="text-editor">
  765 + <state relative-caret-position="396">
  766 + <caret line="18" column="19" lean-forward="true" selection-end-line="50" selection-end-column="7" />
  767 + </state>
  768 + </provider>
  769 + </entry>
  770 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.json">
792 <provider selected="true" editor-type-id="text-editor"> 771 <provider selected="true" editor-type-id="text-editor">
793 <state> 772 <state>
794 <caret selection-end-line="2" selection-end-column="1" /> 773 <caret selection-end-line="2" selection-end-column="1" />
795 </state> 774 </state>
796 </provider> 775 </provider>
797 </entry> 776 </entry>
798 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js"> 777 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.json">
799 <provider selected="true" editor-type-id="text-editor"> 778 <provider selected="true" editor-type-id="text-editor">
800 - <state relative-caret-position="566">  
801 - <caret line="68" column="61" lean-forward="true" selection-start-line="68" selection-start-column="61" selection-end-line="68" selection-end-column="61" /> 779 + <state relative-caret-position="22">
  780 + <caret line="1" column="31" selection-start-line="1" selection-start-column="31" selection-end-line="1" selection-end-column="31" />
802 </state> 781 </state>
803 </provider> 782 </provider>
804 </entry> 783 </entry>
805 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js"> 784 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxss">
806 <provider selected="true" editor-type-id="text-editor"> 785 <provider selected="true" editor-type-id="text-editor">
807 - <state relative-caret-position="498">  
808 - <caret line="127" column="67" lean-forward="true" selection-start-line="127" selection-start-column="67" selection-end-line="127" selection-end-column="67" /> 786 + <state relative-caret-position="22">
  787 + <caret line="1" column="76" selection-start-line="1" selection-start-column="76" selection-end-line="1" selection-end-column="76" />
809 </state> 788 </state>
810 </provider> 789 </provider>
811 </entry> 790 </entry>
812 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss"> 791 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
813 <provider selected="true" editor-type-id="text-editor"> 792 <provider selected="true" editor-type-id="text-editor">
814 - <state relative-caret-position="308">  
815 - <caret line="35" selection-start-line="35" selection-end-line="38" selection-end-column="1" /> 793 + <state relative-caret-position="154">
  794 + <caret line="90" column="28" lean-forward="true" selection-start-line="90" selection-start-column="28" selection-end-line="90" selection-end-column="28" />
816 </state> 795 </state>
817 </provider> 796 </provider>
818 </entry> 797 </entry>
819 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.json"> 798 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">
820 <provider selected="true" editor-type-id="text-editor"> 799 <provider selected="true" editor-type-id="text-editor">
821 - <state relative-caret-position="22">  
822 - <caret line="1" column="35" lean-forward="true" selection-start-line="1" selection-start-column="35" selection-end-line="1" selection-end-column="35" /> 800 + <state relative-caret-position="-30">
  801 + <caret line="15" column="69" selection-start-line="15" selection-start-column="69" selection-end-line="15" selection-end-column="69" />
823 </state> 802 </state>
824 </provider> 803 </provider>
825 </entry> 804 </entry>
826 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss"> 805 + <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml">
  806 + <provider selected="true" editor-type-id="text-editor" />
  807 + </entry>
  808 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js">
827 <provider selected="true" editor-type-id="text-editor"> 809 <provider selected="true" editor-type-id="text-editor">
828 - <state relative-caret-position="806">  
829 - <caret line="73" column="28" selection-start-line="73" selection-start-column="28" selection-end-line="73" selection-end-column="28" /> 810 + <state relative-caret-position="654">
  811 + <caret line="99" column="61" lean-forward="true" selection-start-line="99" selection-start-column="61" selection-end-line="99" selection-end-column="61" />
830 </state> 812 </state>
831 </provider> 813 </provider>
832 </entry> 814 </entry>
833 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml"> 815 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.json">
  816 + <provider selected="true" editor-type-id="text-editor" />
  817 + </entry>
  818 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
834 <provider selected="true" editor-type-id="text-editor"> 819 <provider selected="true" editor-type-id="text-editor">
835 - <state relative-caret-position="1364">  
836 - <caret line="62" selection-start-line="62" selection-end-line="62" /> 820 + <state relative-caret-position="30">
  821 + <caret line="10" column="34" selection-start-line="10" selection-start-column="14" selection-end-line="10" selection-end-column="34" />
837 </state> 822 </state>
838 </provider> 823 </provider>
839 </entry> 824 </entry>
840 - <entry file="file://$PROJECT_DIR$/app.json"> 825 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
841 <provider selected="true" editor-type-id="text-editor"> 826 <provider selected="true" editor-type-id="text-editor">
842 - <state relative-caret-position="88">  
843 - <caret line="4" column="40" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" /> 827 + <state relative-caret-position="330">
  828 + <caret line="15" column="25" lean-forward="true" selection-start-line="15" selection-start-column="25" selection-end-line="15" selection-end-column="25" />
844 </state> 829 </state>
845 </provider> 830 </provider>
846 </entry> 831 </entry>
847 - <entry file="file://$PROJECT_DIR$/pages/index/index.js"> 832 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
848 <provider selected="true" editor-type-id="text-editor"> 833 <provider selected="true" editor-type-id="text-editor">
849 - <state relative-caret-position="586">  
850 - <caret line="58" column="62" selection-start-line="58" selection-start-column="55" selection-end-line="58" selection-end-column="62" />  
851 - <folding>  
852 - <element signature="n#!!doc" expanded="true" />  
853 - </folding> 834 + <state relative-caret-position="308">
  835 + <caret line="14" column="34" selection-start-line="14" selection-start-column="18" selection-end-line="14" selection-end-column="34" />
854 </state> 836 </state>
855 </provider> 837 </provider>
856 </entry> 838 </entry>
857 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml"> 839 + <entry file="file://$PROJECT_DIR$/app.js">
858 <provider selected="true" editor-type-id="text-editor"> 840 <provider selected="true" editor-type-id="text-editor">
859 - <state relative-caret-position="286">  
860 - <caret line="13" column="99" lean-forward="true" selection-start-line="13" selection-start-column="99" selection-end-line="13" selection-end-column="99" /> 841 + <state relative-caret-position="256">
  842 + <caret line="127" column="11" selection-start-line="127" selection-start-column="4" selection-end-line="127" selection-end-column="11" />
861 </state> 843 </state>
862 </provider> 844 </provider>
863 </entry> 845 </entry>
864 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js"> 846 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
865 <provider selected="true" editor-type-id="text-editor"> 847 <provider selected="true" editor-type-id="text-editor">
866 - <state relative-caret-position="333">  
867 - <caret line="41" column="16" lean-forward="true" selection-start-line="41" selection-start-column="16" selection-end-line="51" selection-end-column="18" /> 848 + <state relative-caret-position="369">
  849 + <caret line="65" selection-start-line="65" selection-end-line="104" selection-end-column="6" />
  850 + <folding>
  851 + <element signature="e#1785#3272#0" />
  852 + </folding>
868 </state> 853 </state>
869 </provider> 854 </provider>
870 </entry> 855 </entry>
871 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js"> 856 + <entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.json">
  857 + <provider selected="true" editor-type-id="text-editor" />
  858 + </entry>
  859 + <entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml">
  860 + <provider selected="true" editor-type-id="text-editor">
  861 + <state relative-caret-position="638">
  862 + <caret line="29" column="23" selection-start-line="29" selection-start-column="15" selection-end-line="29" selection-end-column="23" />
  863 + </state>
  864 + </provider>
  865 + </entry>
  866 + <entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js">
872 <provider selected="true" editor-type-id="text-editor"> 867 <provider selected="true" editor-type-id="text-editor">
873 - <state relative-caret-position="660">  
874 - <caret line="39" column="6" lean-forward="true" selection-start-line="39" selection-start-column="6" selection-end-line="39" selection-end-column="6" /> 868 + <state relative-caret-position="726">
  869 + <caret line="120" column="37" selection-start-line="120" selection-start-column="37" selection-end-line="120" selection-end-column="37" />
875 </state> 870 </state>
876 </provider> 871 </provider>
877 </entry> 872 </entry>
@@ -26,7 +26,8 @@ @@ -26,7 +26,8 @@
26 "pages/clock/punchAppealDetail2/punchAppealDetail2", 26 "pages/clock/punchAppealDetail2/punchAppealDetail2",
27 "pages/clock/punchAppealDetail/punchAppealDetail", 27 "pages/clock/punchAppealDetail/punchAppealDetail",
28 "pages/clock/punchAppeal/punchAppeal", 28 "pages/clock/punchAppeal/punchAppeal",
29 - "pages/clock/clock" 29 + "pages/clock/clock",
  30 + "pages/my/edit-student/edit-student"
30 ], 31 ],
31 "window": { 32 "window": {
32 "backgroundTextStyle": "light", 33 "backgroundTextStyle": "light",
1 // pages/clock/clock.js 1 // pages/clock/clock.js
2 -const app =getApp(); 2 +const app = getApp();
3 // 引入SDK核心类 3 // 引入SDK核心类
4 var QQMapWX = require('../../utils/qqmap-wx-jssdk.min.js'); 4 var QQMapWX = require('../../utils/qqmap-wx-jssdk.min.js');
  5 +var getLocation = function (self) {//当第一次未授权时需要重新调用此接口
  6 + wx.getLocation({
  7 + type: 'wgs84',
  8 + success: function (res) {
  9 + console.log('再次授权结果', res);
  10 + self.setData({
  11 + latitude: res.latitude,
  12 + longitude: res.longitude
  13 + });
  14 + var latitude = res.latitude;
  15 + var longitude = res.longitude;
  16 + // 实例化API核心类
  17 + var demo = new QQMapWX({
  18 + key: 'CLVBZ-KHZKP-KWLDW-VDJTA-QVUST-XOBVO' // 必填
  19 + });
  20 +
  21 + // 调用接口
  22 + demo.reverseGeocoder({
  23 + location: {
  24 + latitude: res.latitude,//纬度
  25 + longitude: res.longitude//经度
  26 + },
  27 + success: function (res) {
  28 + console.log('城市', res);
  29 + let params = {
  30 + city: res.result.address_component.city,
  31 + lat: latitude,//纬度
  32 + lng: longitude,//经度
  33 + };
  34 + self.postPosition(params);
  35 + },
  36 + fail: function (res) {
  37 + console.log(res);
  38 + },
  39 + complete: function (res) {
  40 + // console.log(res);
  41 + }
  42 + });
  43 + },
  44 + fail: function () {
  45 + wx.showToast({
  46 + title: '授权失败',
  47 + icon: 'none',
  48 + duration: 1000
  49 + })
  50 + }
  51 + })
  52 +}
  53 +
  54 +
5 Page({ 55 Page({
6 56
7 /** 57 /**
@@ -9,12 +59,27 @@ Page({ @@ -9,12 +59,27 @@ Page({
9 */ 59 */
10 data: { 60 data: {
11 punchState: true, 61 punchState: true,
12 - address: '',  
13 - hasPhone: true, 62 + test: {name: ''},
  63 + is_bingding: false,
14 }, 64 },
15 //首次登录小程序，跳转到认证手机页面 65 //首次登录小程序，跳转到认证手机页面
16 goPhoneCode() { 66 goPhoneCode() {
17 - wx.navigateTo({url: '/pages/index/phone-code/phone-code'}) 67 + wx.navigateTo({url: '/pages/index/phone-code/phone-code?from_clock=' + true})
  68 + },
  69 + //判断手机号是否绑定
  70 + checkMobile() {
  71 + let url = '/portal/Index/check_mobile';
  72 + let header = {
  73 + "XX-token": wx.getStorageSync('token')
  74 + };
  75 + app.post(url, {},header).then((res) => {
  76 + console.log(res);
  77 + if(res.is_binding) {
  78 + this.setData({is_bingding: true})
  79 + }else {
  80 + this.setData({is_bingding: false})
  81 + }
  82 + })
18 }, 83 },
19 //打卡申诉 84 //打卡申诉
20 punchApply() { 85 punchApply() {
@@ -24,33 +89,24 @@ Page({ @@ -24,33 +89,24 @@ Page({
24 }, 89 },
25 //打卡 90 //打卡
26 punch() { 91 punch() {
27 - var that = this  
28 - wx.getLocation({  
29 - type: 'wgs84',  
30 - success: function (res) {  
31 - var latitude = res.latitude  
32 - var longitude = res.longitude  
33 - var speed = res.speed  
34 - var accuracy = res.accuracy  
35 - that.setData({  
36 - address: '天津市',  
37 - punchState: false 92 + let url = '/portal/Experiment/user_sign';
  93 + let header = {
  94 + "XX-token": wx.getStorageSync('token')
  95 + };
  96 + let params = {
  97 + lab_id: this.data.test.id,//实验室id
  98 + lat: this.data.latitude,
  99 + lng: this.data.longitude,
  100 + };
  101 + app.post(url, params, header).then((res) => {
  102 + console.log('打卡结果',res);
  103 + if(res.is_success) {
  104 + this.setData({
  105 + punchState: false,
38 }) 106 })
39 - }, 107 + }
40 }) 108 })
41 109
42 - // wx.chooseLocation({  
43 - // success: function(res) {  
44 - // console.log(res)  
45 - // var latitude = res.latitude  
46 - // var longitude = res.longitude  
47 - // var address = res.address  
48 - // that.setData({  
49 - // address: address,  
50 - // punchState:false  
51 - // })  
52 - // },  
53 - // })  
54 }, 110 },
55 // 打卡页面获取用户所在实验室 111 // 打卡页面获取用户所在实验室
56 postPosition(params) { 112 postPosition(params) {
@@ -58,20 +114,22 @@ Page({ @@ -58,20 +114,22 @@ Page({
58 let header = { 114 let header = {
59 "XX-token": wx.getStorageSync('token') 115 "XX-token": wx.getStorageSync('token')
60 }; 116 };
61 - app.post(url,params,header).then((res) => {  
62 - console.log(res); 117 + app.post(url, params, header).then((res) => {
  118 + console.log('获取用户所在实验室',res);
63 this.setData({ 119 this.setData({
64 - card_info: res 120 + test: res
65 }) 121 })
66 }) 122 })
67 }, 123 },
68 - //打卡页面获取用户所在实验室 124 + //打卡页面获取位置授权
69 getExperiment() { 125 getExperiment() {
  126 + console.log('实验室');
70 const self = this; 127 const self = this;
71 - if(wx.getStorageSync('city')) { 128 + if (wx.getStorageSync('city')) {//如果第一次授权过
  129 + console.log(111);
72 wx.getLocation({ 130 wx.getLocation({
73 type: 'wgs84', 131 type: 'wgs84',
74 - success (res) { 132 + success(res) {
75 let params = { 133 let params = {
76 city: wx.getStorageSync('city'), 134 city: wx.getStorageSync('city'),
77 lat: res.latitude,//纬度 135 lat: res.latitude,//纬度
@@ -80,42 +138,54 @@ Page({ @@ -80,42 +138,54 @@ Page({
80 self.postPosition(params); 138 self.postPosition(params);
81 } 139 }
82 }); 140 });
83 - }else {  
84 - //获取当前城市  
85 - wx.getLocation({  
86 - type: 'wgs84',  
87 - success: function(res) {  
88 - console.log(res);  
89 - // 实例化API核心类  
90 - var demo = new QQMapWX({  
91 - key: 'CLVBZ-KHZKP-KWLDW-VDJTA-QVUST-XOBVO' // 必填  
92 - });  
93 -  
94 - // 调用接口  
95 - demo.reverseGeocoder({  
96 - location: {  
97 - latitude: res.latitude,//纬度  
98 - longitude: res.longitude//经度  
99 - }, 141 + } else {//重新调起授权
  142 + console.log('获取当前城市');
  143 + wx.getSetting({
  144 + success: (res) => {
  145 + if (res.authSetting['scope.userLocation'] != undefined && res.authSetting['scope.userLocation'] != true) {//非初始化进入该页面,且未授权
  146 + wx.showModal({
  147 + title: '是否授权当前位置',
  148 + content: '需要获取您的地理位置，请确认授权，否则无法完成打卡',
100 success: function (res) { 149 success: function (res) {
101 - console.log('城市',res);  
102 - let params = {  
103 - city: res.result.address_component.city,  
104 - // lat: res.latitude,//纬度  
105 - // lng: res.longitude,//经度  
106 - };  
107 - // self.postPosition(params);  
108 - },  
109 - fail: function (res) {  
110 - console.log(res);  
111 - },  
112 - complete: function (res) {  
113 - // console.log(res); 150 + if (res.cancel) {
  151 + self.setData({
  152 + isshowCIty: false
  153 + })
  154 + wx.showToast({
  155 + title: '授权失败',
  156 + icon: 'none',
  157 + duration: 1000
  158 + })
  159 + } else if (res.confirm) {
  160 + wx.openSetting({
  161 + success: function (dataAu) {
  162 + if (dataAu.authSetting["scope.userLocation"] == true) {
  163 + wx.showToast({
  164 + title: '授权成功',
  165 + icon: 'success',
  166 + duration: 1000
  167 + })
  168 + //再次授权，调用getLocationt的API
  169 + getLocation(self);
  170 + } else {
  171 + wx.showToast({
  172 + title: '授权失败',
  173 + icon: 'none',
  174 + duration: 1000
  175 + })
114 } 176 }
115 - });  
116 } 177 }
117 - });  
118 - 178 + })
  179 + }
  180 + }
  181 + })
  182 + } else if (res.authSetting['scope.userLocation'] == undefined) {//初始化进入
  183 + getLocation(self);
  184 + } else { //授权后默认加载
  185 + // getLocation(self);
  186 + }
  187 + }
  188 + })
119 } 189 }
120 }, 190 },
121 /** 191 /**
@@ -123,7 +193,7 @@ Page({ @@ -123,7 +193,7 @@ Page({
123 */ 193 */
124 onLoad: function (options) { 194 onLoad: function (options) {
125 const self = this; 195 const self = this;
126 - self.getExperiment(); 196 + self.checkMobile();
127 }, 197 },
128 198
129 /** 199 /**
@@ -137,7 +207,8 @@ Page({ @@ -137,7 +207,8 @@ Page({
137 * 生命周期函数--监听页面显示 207 * 生命周期函数--监听页面显示
138 */ 208 */
139 onShow: function () { 209 onShow: function () {
140 - 210 + const self = this;
  211 + self.getExperiment();
141 }, 212 },
142 213
143 /** 214 /**
1 <!--pages/clock/clock.wxml--> 1 <!--pages/clock/clock.wxml-->
2 <view class='content_box'> 2 <view class='content_box'>
3 <!--蒙层--> 3 <!--蒙层-->
4 - <view class="modal" wx:if="{{!hasPhone}}" bindtap="goPhoneCode"></view> 4 + <view class="modal" wx:if="{{!is_bingding}}" bindtap="goPhoneCode"></view>
5 <view class='circle_large'> 5 <view class='circle_large'>
6 <view class='circle_middle'> 6 <view class='circle_middle'>
7 <view class='circle_small'> 7 <view class='circle_small'>
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 </view> 10 </view>
11 </view> 11 </view>
12 </view> 12 </view>
13 - <view class='punch_info' wx:if="{{address==''}}">当前：未获取</view>  
14 - <view class='punch_info' wx:else>当前：{{address}}</view> 13 + <view class='punch_info' wx:if="{{test.name==''}}">当前：未获取</view>
  14 + <view class='punch_info' wx:else>当前：{{test.name}}</view>
15 <view class='punch_btn' bindtap='punchApply'>打卡申诉</view> 15 <view class='punch_btn' bindtap='punchApply'>打卡申诉</view>
16 </view> 16 </view>
1 // pages/punchAppeal/punchAppeal.js 1 // pages/punchAppeal/punchAppeal.js
  2 +const app = getApp();
2 Page({ 3 Page({
3 4
4 /** 5 /**
@@ -8,7 +9,11 @@ Page({ @@ -8,7 +9,11 @@ Page({
8 current: 0, 9 current: 0,
9 maxlength: 100, 10 maxlength: 100,
10 minlength: 0, 11 minlength: 0,
11 - currentnum: 0 12 + currentnum: 0,
  13 + image: '',
  14 + image1: '',
  15 + image2: '',
  16 + textcontent: '',
12 }, 17 },
13 //tab切换 18 //tab切换
14 tabCharge(e) { 19 tabCharge(e) {
@@ -36,23 +41,78 @@ Page({ @@ -36,23 +41,78 @@ Page({
36 return 41 return
37 } else { 42 } else {
38 this.setData({ 43 this.setData({
39 - currentnum: len 44 + currentnum: len,
  45 + textcontent: textcontent,
40 }) 46 })
41 } 47 }
42 }, 48 },
43 //上传图片 49 //上传图片
44 - uploadImg() { 50 + uploadImg(e) {
  51 + const current = +e.currentTarget.dataset.current;
  52 + const self = this;
  53 + self.chooseImage(current);
  54 + },
  55 + //选择图片
  56 + chooseImage(current) {
  57 + const self = this;
45 wx.chooseImage({ 58 wx.chooseImage({
46 - success: function(res) {  
47 - console.log(res)  
48 - const tempFilePaths = res.tempFilePaths  
49 - wx.uploadFile({  
50 - url: '',  
51 - filePath: 'tempFilePaths[0]',  
52 - name: 'file', 59 + count: 1, //最多可以选择的图片总数
  60 + sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
  61 + sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
  62 + success: function (res) {
  63 + // console.log(res);
  64 + const tempFilePaths = res.tempFilePaths;
  65 + if (current === 0) {
  66 + self.setData({image: tempFilePaths[0]});
  67 + } else if (current === 1) {
  68 + self.setData({image1: tempFilePaths[0]});
  69 + } else {
  70 + self.setData({image2: tempFilePaths[0]});
  71 + }
  72 + const images = [];
  73 + const new_images = [];
  74 + images.push(self.data.image,self.data.image1,self.data.image2);
  75 + images.map((item)=> {
  76 + if(item !== '') {
  77 + new_images.push(item)
  78 + }
  79 + });
  80 + self.setData({new_images: new_images.join(',')});
  81 + console.log('images',new_images.join(','));
  82 + },
53 }) 83 })
54 }, 84 },
  85 + //提交
  86 + submit() {
  87 + const self = this;
  88 + if(self.data.image === '' && self.data.image1 === '' && self.data.image2 === '') {
  89 + wx.showToast({title:'请上传申诉照片!',icon: 'none'})
  90 + }else if(self.data.textcontent === ''){
  91 + wx.showToast({title:'请填写申诉文字!',icon: 'none'})
  92 + }else {
  93 + let url = '/portal/Experiment/user_complain';
  94 + let header = {
  95 + "XX-token": wx.getStorageSync('token')
  96 + };
  97 + let params = {
  98 + images: this.data.new_images,//实验室id
  99 + description: this.data.textcontent,
  100 + };
  101 + app.post(url, params, header).then((res) => {
  102 + console.log('提交结果',res);
  103 + if(res.data.is_success) {
  104 + wx.showToast({
  105 + title:'申诉成功',
  106 + icon: 'success',
  107 + success:function () {
  108 + setTimeout(function () {
  109 + self.setData({current: 1})
  110 + },500)
  111 + }
55 }) 112 })
  113 + }
  114 + })
  115 + }
56 }, 116 },
57 //跳转申诉详情页 117 //跳转申诉详情页
58 listDetail() { 118 listDetail() {
@@ -63,56 +123,56 @@ Page({ @@ -63,56 +123,56 @@ Page({
63 /** 123 /**
64 * 生命周期函数--监听页面加载 124 * 生命周期函数--监听页面加载
65 */ 125 */
66 - onLoad: function(options) { 126 + onLoad: function (options) {
67 127
68 }, 128 },
69 129
70 /** 130 /**
71 * 生命周期函数--监听页面初次渲染完成 131 * 生命周期函数--监听页面初次渲染完成
72 */ 132 */
73 - onReady: function() { 133 + onReady: function () {
74 134
75 }, 135 },
76 136
77 /** 137 /**
78 * 生命周期函数--监听页面显示 138 * 生命周期函数--监听页面显示
79 */ 139 */
80 - onShow: function() { 140 + onShow: function () {
81 141
82 }, 142 },
83 143
84 /** 144 /**
85 * 生命周期函数--监听页面隐藏 145 * 生命周期函数--监听页面隐藏
86 */ 146 */
87 - onHide: function() { 147 + onHide: function () {
88 148
89 }, 149 },
90 150
91 /** 151 /**
92 * 生命周期函数--监听页面卸载 152 * 生命周期函数--监听页面卸载
93 */ 153 */
94 - onUnload: function() { 154 + onUnload: function () {
95 155
96 }, 156 },
97 157
98 /** 158 /**
99 * 页面相关事件处理函数--监听用户下拉动作 159 * 页面相关事件处理函数--监听用户下拉动作
100 */ 160 */
101 - onPullDownRefresh: function() { 161 + onPullDownRefresh: function () {
102 162
103 }, 163 },
104 164
105 /** 165 /**
106 * 页面上拉触底事件的处理函数 166 * 页面上拉触底事件的处理函数
107 */ 167 */
108 - onReachBottom: function() { 168 + onReachBottom: function () {
109 169
110 }, 170 },
111 171
112 /** 172 /**
113 * 用户点击右上角分享 173 * 用户点击右上角分享
114 */ 174 */
115 - onShareAppMessage: function() { 175 + onShareAppMessage: function () {
116 176
117 } 177 }
118 }) 178 })
@@ -16,22 +16,25 @@ @@ -16,22 +16,25 @@
16 <view class='hint_info'>注：最多可上传3张照片</view> 16 <view class='hint_info'>注：最多可上传3张照片</view>
17 </view> 17 </view>
18 </view> 18 </view>
19 - <view class='uoload_box'>  
20 - <view class='upload_item' bindtap='uploadImg'>  
21 - <text class='iconfont icon-jia'></text> 19 + <view class='uoload_box' >
  20 + <view class='upload_item' data-current="0" bindtap='uploadImg'>
  21 + <text class='iconfont icon-jia' wx:if="{{image === ''}}"></text>
  22 + <image src="{{image}}" mode="aspectFill" wx:if="{{image !== ''}}"></image>
22 </view> 23 </view>
23 - <view class='upload_item'>  
24 - <text class='iconfont icon-jia'></text> 24 + <view class='upload_item' data-current="1" bindtap='uploadImg'>
  25 + <text class='iconfont icon-jia' wx:if="{{image1 === ''}}"></text>
  26 + <image src="{{image1}}" mode="aspectFill" wx:if="{{image1 !== ''}}"></image>
25 </view> 27 </view>
26 - <view class='upload_item'>  
27 - <text class='iconfont icon-jia'></text> 28 + <view class='upload_item' data-current="2" bindtap='uploadImg'>
  29 + <text class='iconfont icon-jia' wx:if="{{image2 === ''}}"></text>
  30 + <image src="{{image2}}" mode="aspectFill" wx:if="{{image2 !== ''}}"></image>
28 </view> 31 </view>
29 </view> 32 </view>
30 </view> 33 </view>
31 <view class='item_list'> 34 <view class='item_list'>
32 <view class='list_title'>申诉内容</view> 35 <view class='list_title'>申诉内容</view>
33 <view class='list_input'> 36 <view class='list_input'>
34 - <textarea placeholder='请输入您的申诉内容...' bindinput='appealContent' placeholder-style='color:#C3C3C3'> 37 + <textarea placeholder='请输入您的申诉内容...' bindinput='appealContent' placeholder-style='color:#C3C3C3' maxlength="100">
35 </textarea> 38 </textarea>
36 <view class='word_num'>{{currentnum}}/{{maxlength}}</view> 39 <view class='word_num'>{{currentnum}}/{{maxlength}}</view>
37 </view> 40 </view>
@@ -40,7 +43,7 @@ @@ -40,7 +43,7 @@
40 <text>当前：xxx实验室</text> 43 <text>当前：xxx实验室</text>
41 </view> 44 </view>
42 <view class='null_box'></view> 45 <view class='null_box'></view>
43 - <view class='submit_btn'>提 交</view> 46 + <view class='submit_btn' bindtap="submit">提 交</view>
44 </view> 47 </view>
45 </view> 48 </view>
46 </block> 49 </block>
@@ -100,6 +100,10 @@ page { @@ -100,6 +100,10 @@ page {
100 align-items: center; 100 align-items: center;
101 justify-content: center; 101 justify-content: center;
102 } 102 }
  103 +.upload_item image {
  104 + width: 100%;
  105 + height: 100%;
  106 +}
103 107
104 .icon-jia { 108 .icon-jia {
105 font-size: 40rpx; 109 font-size: 40rpx;
@@ -52,7 +52,7 @@ Page({ @@ -52,7 +52,7 @@ Page({
52 }, 52 },
53 //首次登录小程序，跳转到认证手机页面 53 //首次登录小程序，跳转到认证手机页面
54 goPhoneCode() { 54 goPhoneCode() {
55 - wx.navigateTo({url: '/pages/index/phone-code/phone-code'}) 55 + wx.navigateTo({url: '/pages/index/phone-code/phone-code?from_index=' + true})
56 }, 56 },
57 //点击购买畅玩卡 57 //点击购买畅玩卡
58 goBuyCard() { 58 goBuyCard() {
@@ -114,24 +114,12 @@ Page({ @@ -114,24 +114,12 @@ Page({
114 const id = e.currentTarget.dataset.id; 114 const id = e.currentTarget.dataset.id;
115 wx.navigateTo({url: '/pages/index/activity-detail/activity-detail?test_id=' + id}) 115 wx.navigateTo({url: '/pages/index/activity-detail/activity-detail?test_id=' + id})
116 }, 116 },
117 - getUser() {  
118 - let url = '/user/Profile/getUserInfo';  
119 - let header = {  
120 - "XX-token": wx.getStorageSync('token')  
121 - };  
122 - app.post(url, {},header).then((res) => {  
123 - // console.log('个人信息结果',res);  
124 - // self.setData({past_test_info: res})  
125 - // console.log(self.data.this_week_test_info);  
126 - });  
127 - },  
128 onLoad: function (options) { 117 onLoad: function (options) {
129 const self = this; 118 const self = this;
130 console.log(options); 119 console.log(options);
131 self.setData({is_bingding: +options.is_bingding?+options.is_bingding:''}); 120 self.setData({is_bingding: +options.is_bingding?+options.is_bingding:''});
132 self.getTheWeekTest(); 121 self.getTheWeekTest();
133 self.getPastWeekTest(); 122 self.getPastWeekTest();
134 - self.getUser();  
135 self.checkMobile(); 123 self.checkMobile();
136 //获取当前城市 124 //获取当前城市
137 wx.getLocation({ 125 wx.getLocation({
@@ -84,9 +84,20 @@ Page({ @@ -84,9 +84,20 @@ Page({
84 }; 84 };
85 app.post(url, params,header).then((res) => { 85 app.post(url, params,header).then((res) => {
86 console.log('绑定结果',res); 86 console.log('绑定结果',res);
  87 + if(self.data.from_index) {
87 wx.switchTab({ 88 wx.switchTab({
88 - url: '../../index/index?is_bingding?' + res.is_bingding 89 + url: '/pages/index/index?is_bingding?' + res.is_bingding
89 }) 90 })
  91 + }else if(self.data.from_clock) {
  92 + wx.switchTab({
  93 + url: '/pages/clock/clock?is_bingding?' + res.is_bingding
  94 + })
  95 + }else if(self.data.from_my) {
  96 + wx.switchTab({
  97 + url: '/pages/my/my?is_bingding?' + res.is_bingding
  98 + })
  99 + }
  100 +
90 // self.setData({past_test_info: res}) 101 // self.setData({past_test_info: res})
91 // console.log(self.data.this_week_test_info); 102 // console.log(self.data.this_week_test_info);
92 }); 103 });
@@ -97,6 +108,11 @@ Page({ @@ -97,6 +108,11 @@ Page({
97 * 生命周期函数--监听页面加载 108 * 生命周期函数--监听页面加载
98 */ 109 */
99 onLoad: function (options) { 110 onLoad: function (options) {
  111 + this.setData({
  112 + from_index: options.from_index?options.from_index:'',
  113 + from_clock: options.from_clock?options.from_clock:'',
  114 + from_my: options.from_my?options.from_my:'',
  115 + })
100 }, 116 },
101 117
102 /** 118 /**
1 // pages/my/all-appointment/all-appointment.js 1 // pages/my/all-appointment/all-appointment.js
  2 +const app =getApp();
2 Page({ 3 Page({
3 4
4 /** 5 /**
@@ -19,21 +20,24 @@ Page({ @@ -19,21 +20,24 @@ Page({
19 this.setData({currentTab: current}); 20 this.setData({currentTab: current});
20 wx.setNavigationBarTitle({ 21 wx.setNavigationBarTitle({
21 title: this.data.tab[current] 22 title: this.data.tab[current]
22 - }) 23 + });
  24 + this.getAppointmentList(current)
23 }, 25 },
24 //获取预约列表 26 //获取预约列表
25 getAppointmentList() { 27 getAppointmentList() {
  28 + const self = this;
26 let url = '/user/Reservation/reservation_list'; 29 let url = '/user/Reservation/reservation_list';
27 let header = { 30 let header = {
28 "XX-token": wx.getStorageSync('token') 31 "XX-token": wx.getStorageSync('token')
29 }; 32 };
30 let params = { 33 let params = {
31 - status: this.data.currentTab 34 + status: self.data.currentTab,
  35 + page: 1,
32 }; 36 };
33 - // app.post(url, params,header).then((res) => {  
34 - // console.log('支付换参',res);  
35 - // this.wxPay(res.pay)  
36 - // }) 37 + app.post(url, params,header).then((res) => {
  38 + console.log('获取预约列表',res);
  39 + self.setData({orderList: res.list})
  40 + })
37 }, 41 },
38 goDetail() { 42 goDetail() {
39 wx.navigateTo({url: '../order-detail/order-detail?currentTab=' + this.data.currentTab}) 43 wx.navigateTo({url: '../order-detail/order-detail?currentTab=' + this.data.currentTab})
@@ -42,7 +46,10 @@ Page({ @@ -42,7 +46,10 @@ Page({
42 * 生命周期函数--监听页面加载 46 * 生命周期函数--监听页面加载
43 */ 47 */
44 onLoad: function (options) { 48 onLoad: function (options) {
45 - this.setData({currentTab: +options.currentTab}) 49 + console.log('options', options);
  50 + const self = this;
  51 + self.setData({currentTab: +options.currentTab});
  52 + self.getAppointmentList();
46 }, 53 },
47 54
48 /** 55 /**
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 <view class="order-box" bindtap="goDetail" wx:for="{{orderList}}" wx:key="index"> 10 <view class="order-box" bindtap="goDetail" wx:for="{{orderList}}" wx:key="index">
11 11
12 <view class="head"> 12 <view class="head">
13 - <text class="number">预约单号：{{item.num}}</text> 13 + <text class="number">预约单号：{{item.reservation_sn}}</text>
14 <text class="appointment-state" wx:if="{{currentTab === 1}}" style="color: #FC5B63;">待确认</text> 14 <text class="appointment-state" wx:if="{{currentTab === 1}}" style="color: #FC5B63;">待确认</text>
15 <text class="appointment-state" wx:if="{{currentTab === 2}}">已预约</text> 15 <text class="appointment-state" wx:if="{{currentTab === 2}}">已预约</text>
16 <text class="appointment-state" wx:if="{{currentTab === 3}}" style="color: #464646;">已取消</text> 16 <text class="appointment-state" wx:if="{{currentTab === 3}}" style="color: #464646;">已取消</text>
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <view class="right-bottom-box"> 32 <view class="right-bottom-box">
33 <view class="iconfont icon-shangwutubiao"></view> 33 <view class="iconfont icon-shangwutubiao"></view>
34 <view class="date-box"> 34 <view class="date-box">
35 - <view class="date">预约日期：{{item.date}}</view> 35 + <view class="date">预约日期：{{item.time}}</view>
36 36
37 <view class="not_confirm" wx:if="{{currentTab === 1}}"> 37 <view class="not_confirm" wx:if="{{currentTab === 1}}">
38 <view class="go-cancel">取消</view> 38 <view class="go-cancel">取消</view>
1 // pages/chargePhoneNum/chargePhoneNum.js 1 // pages/chargePhoneNum/chargePhoneNum.js
  2 +const app = getApp();
  3 +var interval = null //倒计时函数
2 Page({ 4 Page({
3 5
4 /** 6 /**
5 * 页面的初始数据 7 * 页面的初始数据
6 */ 8 */
7 data: { 9 data: {
8 - 10 + time: '获取验证码', //倒计时
  11 + currentTime: 61,
  12 + new_phone: '',
  13 + old_phone:'',
  14 + old_verification_code: '',
  15 + new_verification_code: '',
  16 + },
  17 + phoneInput(e) {
  18 + this.setData({new_phone: e.detail.value})
  19 + },
  20 + codeInput(e) {
  21 + if(this.data.new_phone === '') {
  22 + this.setData({old_verification_code: e.detail.value})
  23 + }else {
  24 + this.setData({new_verification_code: e.detail.value})
  25 + }
  26 + },
  27 + //获取验证码
  28 + getCode: function (options) {
  29 + var that = this;
  30 + var currentTime = that.data.currentTime;
  31 + interval = setInterval(function () {
  32 + currentTime--;
  33 + that.setData({
  34 + time: currentTime + '秒'
  35 + })
  36 + if (currentTime <= 0) {
  37 + clearInterval(interval);
  38 + that.setData({
  39 + time: '重新发送',
  40 + currentTime: 61,
  41 + disabled: false
  42 + })
  43 + }
  44 + }, 1000);
  45 + if(this.data.new_phone === '') {
  46 + let url = '/user/Profile/getOldCode';
  47 + let params = {
  48 + mobile: that.data.old_phone,
  49 + };
  50 + let header = {
  51 + "XX-token": wx.getStorageSync('token')
  52 + };
  53 + app.post(url, params,header).then((res) => {
  54 + console.log('旧验证码',res);
  55 + that.setData({old_verification_code: res.code})
  56 + // console.log(this.data.this_week_test_info);
  57 + })
  58 + }else {
  59 + let url = '/user/Profile/getNewCode';
  60 + let params = {
  61 + mobile: that.data.new_phone,
  62 + time: app.nowDate(),
  63 + };
  64 + let header = {
  65 + "XX-token": wx.getStorageSync('token')
  66 + };
  67 + app.post(url, params,header).then((res) => {
  68 + console.log('新验证码',res);
  69 + that.setData({new_verification_code: res.code})
  70 + // console.log(this.data.this_week_test_info);
  71 + })
  72 + }
9 }, 73 },
  74 + //获取验证码
  75 + getVerificationCode() {
  76 + var that = this;
  77 + if(that.data.new_phone !== '' || that.data.old_phone) {
  78 + that.getCode();
  79 + that.setData({
  80 + disabled: true
  81 + })
  82 + }else {
  83 + that.setData({
  84 + disabled: false
  85 + });
  86 + wx.showToast({title: '请输入手机号!',icon: 'none'})
  87 + }
  88 + },
  89 + //下一步/保存
  90 + save_btn() {
  91 + const self = this;
  92 + if(self.data.new_phone === '' || self.data.old_phone === '') {
  93 + wx.showToast({title: '请输入手机号!',icon: 'none'})
  94 + }else if(self.data.old_verification_code === '' || self.data.new_verification_code === '') {
  95 + wx.showToast({title: '请输入验证码!',icon: 'none'})
  96 + }else {
  97 + if(self.data.old_phone && self.data.new_phone === '') {
  98 + let url = '/user/Profile/checkOldMobile';
  99 + let params = {
  100 + mobile: self.data.old_phone,
  101 + verification_code: self.data.old_verification_code,
  102 + time: app.nowDate(),
  103 + };
  104 + let header = {
  105 + "XX-token": wx.getStorageSync('token')
  106 + };
  107 + app.post(url, params,header).then((res) => {
  108 + console.log('原手机号验证结果',res);
  109 + });
  110 + }else if(self.data.new_phone !== '' && self.data.new_verification_code !== '') {
  111 + let url = '/user/Profile/bindingNewMobile';
  112 + let params = {
  113 + mobile: self.data.new_phone,
  114 + verification_code: self.data.new_verification_code,
  115 + time: app.nowDate(),
  116 + };
  117 + let header = {
  118 + "XX-token": wx.getStorageSync('token')
  119 + };
  120 + app.post(url, params,header).then((res) => {
  121 + console.log('新手机号绑定结果',res);
  122 + });
  123 + }
10 124
  125 + }
  126 + },
11 /** 127 /**
12 * 生命周期函数--监听页面加载 128 * 生命周期函数--监听页面加载
13 */ 129 */
14 onLoad: function (options) { 130 onLoad: function (options) {
15 - 131 + console.log(options);
  132 + this.setData({
  133 + old_phone: options.old_phone?options.old_phone:'',
  134 + old_phone_hidden: options.old_phone_hidden?options.old_phone_hidden:'',
  135 + })
16 }, 136 },
17 137
18 /** 138 /**
@@ -9,9 +9,10 @@ @@ -9,9 +9,10 @@
9 <view class='list_box'> 9 <view class='list_box'>
10 <view class='item_list'> 10 <view class='item_list'>
11 <view class='info_box'> 11 <view class='info_box'>
12 - <view>新手机号： </view> 12 + <view wx:if="{{old_phone}}">原手机号：</view>
  13 + <view wx:if="{{new_phone !== ''}}">新手机号： </view>
13 <view class='list_input'> 14 <view class='list_input'>
14 - <input placeholder='188****888' value=''></input> 15 + <input placeholder='{{old_phone_hidden}}' value='{{new_phone}}' bindinput="phoneInput"/>
15 </view> 16 </view>
16 </view> 17 </view>
17 </view> 18 </view>
@@ -19,11 +20,13 @@ @@ -19,11 +20,13 @@
19 <view class='info_box'> 20 <view class='info_box'>
20 <text>验证码： </text> 21 <text>验证码： </text>
21 <view class='list_input'> 22 <view class='list_input'>
22 - <input placeholder='输入验证码' value=''></input> 23 + <input placeholder='输入验证码' value='{{old_verification_code}}' bindinput="codeInput" wx:if="{{new_phone === ''}}"/>
  24 + <input placeholder='输入验证码' value='{{new_verification_code}}' bindinput="codeInput" wx:if="{{new_phone !== ''}}"/>
23 </view> 25 </view>
24 </view> 26 </view>
25 - <button class='get_code'>获取验证码</button> 27 + <button class='get_code' disabled="{{disabled}}" data-id="2" bindtap="getVerificationCode">{{time}}</button>
26 </view> 28 </view>
27 </view> 29 </view>
28 - <view class='save_btn'>保 存</view> 30 + <view class='save_btn' wx:if="{{new_phone === ''}}">下一步</view>
  31 + <view class='save_btn' wx:if="{{new_phone !== ''}}">保 存</view>
29 </view> 32 </view>
  1 +// pages/index/confirm-appointment-info/add-student/add-student.js
  2 +const app = getApp();
  3 +const date = new Date();
  4 +const years = [];
  5 +const months = [];
  6 +const days = [];
  7 +
  8 +for (let i = 1990; i <= date.getFullYear(); i++) {
  9 + years.push(i)
  10 +}
  11 +
  12 +for (let i = 1; i <= 12; i++) {
  13 + months.push(i)
  14 +}
  15 +
  16 +for (let i = 1; i <= 31; i++) {
  17 + days.push(i)
  18 +}
  19 +
  20 +Page({
  21 +
  22 + /**
  23 + * 页面的初始数据
  24 + */
  25 + data: {
  26 + name: '',
  27 + sex: ['男','女'],
  28 + default_sex: {id: 1,name: '男'},
  29 + city: ['北京市', '天津市', '河北省'],
  30 + default_birth: '2008-11-11',
  31 + default_city: '北京市',
  32 + years: years,
  33 + year: date.getFullYear(),
  34 + months: months,
  35 + month: 2,
  36 + days: days,
  37 + day: 2,
  38 + value: [9999, 1, 1],
  39 + },
  40 + inputName(e) {
  41 + this.setData({
  42 + name: e.detail.value
  43 + });
  44 + },
  45 + //选择性别
  46 + sexPickerChange: function(e) {
  47 + console.log('picker发送选择改变，携带值为', e.detail.value)
  48 + this.setData({
  49 + sex_index: e.detail.value,
  50 + is_sex_change: true,
  51 + })
  52 + },
  53 + //选择生日
  54 + birthPickerChange: function(e) {
  55 + console.log('picker发送选择改变，携带值为', e.detail.value)
  56 + this.setData({
  57 + birth_date: e.detail.value,
  58 + is_birth_change: true,
  59 + })
  60 + // const val = e.detail.value;
  61 + // this.setData({
  62 + // year: this.data.years[val[0]],
  63 + // month: this.data.months[val[1]],
  64 + // day: this.data.days[val[2]]
  65 + // })
  66 + },
  67 + //选择城市
  68 + cityPickerChange: function(e) {
  69 + console.log('picker发送选择改变，携带值为', e.detail.value)
  70 + this.setData({
  71 + city_index: e.detail.value,
  72 + is_city_change: true,
  73 + })
  74 + },
  75 + //保存
  76 + clickSave() {
  77 + const self = this;
  78 + let url = '/user/Student/student_edit';
  79 + let header = {
  80 + "XX-token": wx.getStorageSync('token')
  81 + };
  82 + let params = {
  83 + id: self.data.current_student.id,
  84 + name: self.data.name || self.data.current_student.name,
  85 + sex: (self.data.sex[self.data.sex_index] === '男' ? 1 : 2) || (+self.data.current_student.sex === 1 ? 1 : 2),
  86 + birthday: self.data.birth_date || self.data.current_student.birthday,
  87 + city: self.data.city[self.data.city_index] || self.data.current_student.city,
  88 + };
  89 + app.post(url, params, header).then((res) => {
  90 + console.log('保存', res);
  91 + if (res.is_success) {
  92 + wx.showToast({
  93 + title: '编辑成功',
  94 + icon: 'success',
  95 + success: function () {
  96 + setTimeout(function () {
  97 + if (self.data.is_back) {
  98 + wx.navigateBack({delta: 1})
  99 + } else {
  100 + wx.navigateTo({
  101 + url: '../../../my/myProfile/myProfile',
  102 + })
  103 + }
  104 + }, 500)
  105 + }
  106 + })
  107 + }
  108 + })
  109 + },
  110 + /**
  111 + * 生命周期函数--监听页面加载
  112 + */
  113 + onLoad: function(options) {
  114 + console.log('options', options);
  115 + this.setData({
  116 + is_back: options.is_back?options.is_back:'',
  117 + current_student: options.current_student?JSON.parse(options.current_student):'',
  118 + });
  119 + if(options.current_student) {
  120 + const student = JSON.parse(options.current_student)
  121 + this.setData({
  122 + name: student.name,
  123 + // sex:
  124 + })
  125 + }
  126 + },
  127 +
  128 + /**
  129 + * 生命周期函数--监听页面初次渲染完成
  130 + */
  131 + onReady: function() {
  132 +
  133 + },
  134 +
  135 + /**
  136 + * 生命周期函数--监听页面显示
  137 + */
  138 + onShow: function() {
  139 +
  140 + },
  141 +
  142 + /**
  143 + * 生命周期函数--监听页面隐藏
  144 + */
  145 + onHide: function() {
  146 +
  147 + },
  148 +
  149 + /**
  150 + * 生命周期函数--监听页面卸载
  151 + */
  152 + onUnload: function() {
  153 +
  154 + },
  155 +
  156 + /**
  157 + * 页面相关事件处理函数--监听用户下拉动作
  158 + */
  159 + onPullDownRefresh: function() {
  160 +
  161 + },
  162 +
  163 + /**
  164 + * 页面上拉触底事件的处理函数
  165 + */
  166 + onReachBottom: function() {
  167 +
  168 + },
  169 +
  170 + /**
  171 + * 用户点击右上角分享
  172 + */
  173 + onShareAppMessage: function() {
  174 +
  175 + }
  176 +})
  1 +{
  2 + "navigationBarTitleText": "编辑学员"
  3 +}
  1 +<!--pages/index/confirm-appointment-info/add-student/add-student.wxml-->
  2 +<view class="content">
  3 + <view class="input-box">
  4 + <view class="name-box">
  5 + <text>姓 名：</text>
  6 + <input type="text" placeholder="{{current_student.name}}" cursor="100" placeholder-class="placeholder-style"
  7 + value="{{name}}" bindinput="inputName"/>
  8 + </view>
  9 + <picker bindchange="sexPickerChange" value="{{sex_index}}" range="{{sex}}">
  10 + <view class="select-box">
  11 + <view class="select-picker">
  12 + <view class="sex">性 别：</view>
  13 + <view class="picker" wx:if="{{is_sex_change}}">
  14 + {{sex[sex_index]}}
  15 + </view>
  16 + <view wx:else>{{current_student.sex === 1? '男':'女'}}</view>
  17 + </view>
  18 + <view class="iconfont icon-daosanjiao"></view>
  19 + </view>
  20 + </picker>
  21 + <picker bindchange="birthPickerChange" value="{{birth_date}}" mode="date">
  22 + <view class="select-box">
  23 + <view class="select-picker">
  24 + <view class="sex">生 日：</view>
  25 + <view class="picker" wx:if="{{is_birth_change}}">
  26 + {{birth_date}}
  27 + </view>
  28 + <view wx:else>{{current_student.birthday}}</view>
  29 + </view>
  30 + <view class="iconfont icon-daosanjiao"></view>
  31 + </view>
  32 + </picker>
  33 + <picker bindchange="cityPickerChange" value="{{city_index}}" range="{{city}}">
  34 + <view class="select-box">
  35 + <view class="select-picker">
  36 + <view class="sex">城 市：</view>
  37 + <view class="picker" wx:if="{{is_city_change}}">
  38 + {{city[city_index]}}
  39 + </view>
  40 + <view wx:else>{{current_student.city}}</view>
  41 + </view>
  42 + <view class="iconfont icon-daosanjiao"></view>
  43 + </view>
  44 + </picker>
  45 + </view>
  46 + <view class="save-btn" bindtap="clickSave">
  47 + <view class="save-box">
  48 + <text>保 存</text>
  49 + </view>
  50 + </view>
  51 +</view>
  1 +/* pages/my/edit-student/edit-student.wxss */
  2 +@import '../../index/confirm-appointment-info/add-student/add-student.wxss';
1 - // pages/my/my.js  
2 - Page({ 1 +// pages/my/my.js
  2 +const app = getApp();
  3 +Page({
3 4
4 /** 5 /**
5 * 页面的初始数据 6 * 页面的初始数据
6 */ 7 */
7 data: { 8 data: {
8 - hasPhone: true, 9 + is_bingding: false,
9 }, 10 },
10 //首次登录小程序，跳转到认证手机页面 11 //首次登录小程序，跳转到认证手机页面
11 goPhoneCode() { 12 goPhoneCode() {
12 - wx.navigateTo({url: '/pages/index/phone-code/phone-code'}) 13 + wx.navigateTo({url: '/pages/index/phone-code/phone-code?from_my=' + true})
13 }, 14 },
14 //兑换 15 //兑换
15 charge() { 16 charge() {
@@ -18,7 +19,7 @@ @@ -18,7 +19,7 @@
18 }) 19 })
19 }, 20 },
20 //我的资料 21 //我的资料
21 - myProfile(){ 22 + myProfile() {
22 wx.navigateTo({ 23 wx.navigateTo({
23 url: '../my/myProfile/myProfile', 24 url: '../my/myProfile/myProfile',
24 }) 25 })
@@ -61,59 +62,87 @@ @@ -61,59 +62,87 @@
61 url: 'serviceWeChat/serviceWeChat', 62 url: 'serviceWeChat/serviceWeChat',
62 }) 63 })
63 }, 64 },
  65 + //判断手机号是否绑定
  66 + checkMobile() {
  67 + let url = '/portal/Index/check_mobile';
  68 + let header = {
  69 + "XX-token": wx.getStorageSync('token')
  70 + };
  71 + app.post(url, {},header).then((res) => {
  72 + console.log(res);
  73 + if(res.is_binding) {
  74 + this.setData({is_bingding: true})
  75 + }else {
  76 + this.setData({is_bingding: false})
  77 + }
  78 + })
  79 + },
  80 + //获取用户基本信息
  81 + getUser() {
  82 + let url = '/user/Profile/getUserInfo';
  83 + let header = {
  84 + "XX-token": wx.getStorageSync('token')
  85 + };
  86 + app.post(url, {}, header).then((res) => {
  87 + console.log('个人信息结果',res);
  88 + this.setData({personal_info: res.user})
  89 + });
  90 + },
64 /** 91 /**
65 * 生命周期函数--监听页面加载 92 * 生命周期函数--监听页面加载
66 */ 93 */
67 - onLoad: function(options) {  
68 - 94 + onLoad: function (options) {
  95 + const self = this;
  96 + self.getUser();
  97 + self.checkMobile();
69 }, 98 },
70 99
71 /** 100 /**
72 * 生命周期函数--监听页面初次渲染完成 101 * 生命周期函数--监听页面初次渲染完成
73 */ 102 */
74 - onReady: function() { 103 + onReady: function () {
75 104
76 }, 105 },
77 106
78 /** 107 /**
79 * 生命周期函数--监听页面显示 108 * 生命周期函数--监听页面显示
80 */ 109 */
81 - onShow: function() { 110 + onShow: function () {
82 111
83 }, 112 },
84 113
85 /** 114 /**
86 * 生命周期函数--监听页面隐藏 115 * 生命周期函数--监听页面隐藏
87 */ 116 */
88 - onHide: function() { 117 + onHide: function () {
89 118
90 }, 119 },
91 120
92 /** 121 /**
93 * 生命周期函数--监听页面卸载 122 * 生命周期函数--监听页面卸载
94 */ 123 */
95 - onUnload: function() { 124 + onUnload: function () {
96 125
97 }, 126 },
98 127
99 /** 128 /**
100 * 页面相关事件处理函数--监听用户下拉动作 129 * 页面相关事件处理函数--监听用户下拉动作
101 */ 130 */
102 - onPullDownRefresh: function() { 131 + onPullDownRefresh: function () {
103 132
104 }, 133 },
105 134
106 /** 135 /**
107 * 页面上拉触底事件的处理函数 136 * 页面上拉触底事件的处理函数
108 */ 137 */
109 - onReachBottom: function() { 138 + onReachBottom: function () {
110 139
111 }, 140 },
112 141
113 /** 142 /**
114 * 用户点击右上角分享 143 * 用户点击右上角分享
115 */ 144 */
116 - onShareAppMessage: function() { 145 + onShareAppMessage: function () {
117 146
118 } 147 }
119 - })  
  148 +})
1 <!--pages/my/my.wxml--> 1 <!--pages/my/my.wxml-->
2 <view class='box'> 2 <view class='box'>
3 <!--蒙层--> 3 <!--蒙层-->
4 - <view class="modal" wx:if="{{!hasPhone}}" bindtap="goPhoneCode"></view> 4 + <view class="modal" wx:if="{{!is_bingding}}" bindtap="goPhoneCode"></view>
5 <view class='header_box '> 5 <view class='header_box '>
6 <view class='head_box'> 6 <view class='head_box'>
7 <view class='head_img'> 7 <view class='head_img'>
8 - <image src='../../images/head.png'></image> 8 + <image src='{{personal_info.avatar}}'></image>
9 </view> 9 </view>
10 <view> 10 <view>
11 - <view>微信昵称</view>  
12 - <view class='phone_num'>139****0939</view> 11 + <view>{{personal_info.user_nickname}}</view>
  12 + <view class='phone_num'>{{personal_info.mobile}}</view>
13 </view> 13 </view>
14 </view> 14 </view>
15 <view class='my_info_box' bindtap='myProfile'> 15 <view class='my_info_box' bindtap='myProfile'>
1 - // pages/MyProfile/MyProfile.js  
2 - Page({ 1 +// pages/MyProfile/MyProfile.js
  2 +const app = getApp();
  3 +Page({
3 4
4 /** 5 /**
5 * 页面的初始数据 6 * 页面的初始数据
6 */ 7 */
7 - data: { 8 + data: {},
8 9
9 - },  
10 -  
11 - //跟换手机号 10 + //更换手机号
12 chargePhoneNum() { 11 chargePhoneNum() {
13 wx.navigateTo({ 12 wx.navigateTo({
14 - url: '../chargePhoneNum/chargePhoneNum', 13 + url: '../chargePhoneNum/chargePhoneNum?old_phone=' +
  14 + this.data.personal_info.mobile +
  15 + '&old_phone_hidden=' + this.data.personal_info.hidden_mobile,
15 }) 16 })
16 }, 17 },
17 //添加学员 18 //添加学员
18 addUser() { 19 addUser() {
19 wx.navigateTo({ 20 wx.navigateTo({
20 - url: '../../index/confirm-appointment-info/add-student/add-student', 21 + url: '../../index/confirm-appointment-info/add-student/add-student?is_back=' + true,
21 }) 22 })
22 }, 23 },
23 //编辑学员信息 24 //编辑学员信息
24 - editInfo() { 25 + editInfo(e) {
  26 + const current = e.currentTarget.dataset.index;
  27 + console.log(current,JSON.stringify(this.data.student_list[current]));
25 wx.navigateTo({ 28 wx.navigateTo({
26 - url: '../../index/confirm-appointment-info/add-student/add-student', 29 + url: '../edit-student/edit-student?current_student=' +
  30 + JSON.stringify(this.data.student_list[current]) +
  31 + '&is_back=' + true,
27 }) 32 })
28 }, 33 },
29 34
@@ -40,60 +45,109 @@ @@ -40,60 +45,109 @@
40 url: '../myCard/myCard', 45 url: '../myCard/myCard',
41 }) 46 })
42 }, 47 },
43 - 48 + //删除学员
  49 + delStudent(e) {
  50 + const current = e.currentTarget.dataset.index;
  51 + let url = '/user/Student/student_delete';
  52 + let header = {
  53 + "XX-token": wx.getStorageSync('token')
  54 + };
  55 + let params = {
  56 + id: this.data.student_list[current].id,
  57 + };
  58 + app.post(url, params, header).then((res) => {
  59 + console.log('删除学员结果', res);
  60 + });
  61 + const arr = []
  62 + this.data.student_list.map((item) => {
  63 + if(item.id !== this.data.student_list[current].id) {
  64 + arr.push(item)
  65 + }
  66 + });
  67 + console.log('arr', arr);
  68 + this.setData({student_list: arr})
  69 + },
  70 + //获取用户基本信息
  71 + getUser() {
  72 + let url = '/user/Profile/getUserInfo';
  73 + let header = {
  74 + "XX-token": wx.getStorageSync('token')
  75 + };
  76 + app.post(url, {}, header).then((res) => {
  77 + console.log('个人信息结果', res);
  78 + this.setData({personal_info: res.user})
  79 + });
  80 + },
  81 + //获取学员列表
  82 + getStudentList() {
  83 + let url = '/user/Student/student_list';
  84 + let header = {
  85 + "XX-token": wx.getStorageSync('token')
  86 + };
  87 + let params = {
  88 + page: 1,
  89 + };
  90 + app.post(url,params,header).then((res) => {
  91 + console.log('学员列表',res);
  92 + // console.log('list', list);
  93 + this.setData({student_list: res.list})
  94 + })
  95 + },
44 /** 96 /**
45 * 生命周期函数--监听页面加载 97 * 生命周期函数--监听页面加载
46 */ 98 */
47 - onLoad: function(options) {  
48 - 99 + onLoad: function (options) {
  100 + const self = this;
  101 + self.getUser();
49 }, 102 },
50 103
51 /** 104 /**
52 * 生命周期函数--监听页面初次渲染完成 105 * 生命周期函数--监听页面初次渲染完成
53 */ 106 */
54 - onReady: function() { 107 + onReady: function () {
55 108
56 }, 109 },
57 110
58 /** 111 /**
59 * 生命周期函数--监听页面显示 112 * 生命周期函数--监听页面显示
60 */ 113 */
61 - onShow: function() {  
62 - 114 + onShow: function () {
  115 + const self = this;
  116 + self.getStudentList();
63 }, 117 },
64 118
65 /** 119 /**
66 * 生命周期函数--监听页面隐藏 120 * 生命周期函数--监听页面隐藏
67 */ 121 */
68 - onHide: function() { 122 + onHide: function () {
69 123
70 }, 124 },
71 125
72 /** 126 /**
73 * 生命周期函数--监听页面卸载 127 * 生命周期函数--监听页面卸载
74 */ 128 */
75 - onUnload: function() { 129 + onUnload: function () {
76 130
77 }, 131 },
78 132
79 /** 133 /**
80 * 页面相关事件处理函数--监听用户下拉动作 134 * 页面相关事件处理函数--监听用户下拉动作
81 */ 135 */
82 - onPullDownRefresh: function() { 136 + onPullDownRefresh: function () {
83 137
84 }, 138 },
85 139
86 /** 140 /**
87 * 页面上拉触底事件的处理函数 141 * 页面上拉触底事件的处理函数
88 */ 142 */
89 - onReachBottom: function() { 143 + onReachBottom: function () {
90 144
91 }, 145 },
92 146
93 /** 147 /**
94 * 用户点击右上角分享 148 * 用户点击右上角分享
95 */ 149 */
96 - onShareAppMessage: function() { 150 + onShareAppMessage: function () {
97 151
98 } 152 }
99 - })  
  153 +})
@@ -2,13 +2,13 @@ @@ -2,13 +2,13 @@
2 <view class='box'> 2 <view class='box'>
3 <view class='banner_box'> 3 <view class='banner_box'>
4 <view class='head_img'> 4 <view class='head_img'>
5 - <image src='../../../images/head.png'></image> 5 + <image src='{{personal_info.avatar}}'></image>
6 </view> 6 </view>
7 - <view>微信昵称</view> 7 + <view>{{personal_info.user_nickname}}</view>
8 </view> 8 </view>
9 </view> 9 </view>
10 <view class='info_box'> 10 <view class='info_box'>
11 - <view>手机号：188*****888</view> 11 + <view>手机号：{{personal_info.mobile}}</view>
12 <view class='info_content' bindtap='chargePhoneNum'>更换手机号</view> 12 <view class='info_content' bindtap='chargePhoneNum'>更换手机号</view>
13 </view> 13 </view>
14 <view class='title_box'> 14 <view class='title_box'>
@@ -20,36 +20,23 @@ @@ -20,36 +20,23 @@
20 </view> 20 </view>
21 <!-- 未绑定年卡，就需要显示为“购卡”；已有年卡就显示为“续卡” --> 21 <!-- 未绑定年卡，就需要显示为“购卡”；已有年卡就显示为“续卡” -->
22 <view class='box'> 22 <view class='box'>
23 - <view class='list_item'> 23 + <view class='list_item' wx:for="{{student_list}}" wx:key="index">
24 <view class='list_info'> 24 <view class='list_info'>
25 - <text>姓名：男</text>  
26 - <text>性 别：男</text> 25 + <text>姓名：{{item.name}}</text>
  26 + <text>性 别：{{item.sex === 1?'男':'女'}}</text>
27 </view> 27 </view>
28 <view class='list_info'> 28 <view class='list_info'>
29 - <text>生日：2000.01.01</text>  
30 - <text>所在城市：北京</text> 29 + <text>生日：{{item.birthday}}</text>
  30 + <text>所在城市：{{item.city}}</text>
31 </view> 31 </view>
32 <view class='list_label_box'> 32 <view class='list_label_box'>
33 - <view class='label_item edit_btn' bindtap='editInfo'>编辑学员信息</view>  
34 - <view class='label_item renewal_btn' bindtap='renewalInfo'>续卡</view>  
35 - <view class='label_item' bindtap='delUser'>删除学员</view>  
36 - </view>  
37 - <view class='hint_info'>畅玩卡周期：2018.10.01-2019.10.01</view>  
38 - </view>  
39 - <view class='list_item'>  
40 - <view class='list_info'>  
41 - <text>姓名：男</text>  
42 - <text>性 别：男</text>  
43 - </view>  
44 - <view class='list_info'>  
45 - <text>生日：2000.01.01</text>  
46 - <text>所在城市：北京</text>  
47 - </view>  
48 - <view class='list_label_box'>  
49 - <view class='label_item edit_btn' bindtap='editInfo'>编辑学员信息</view>  
50 - <view class='label_item renewal_btn' bindtap='buyCard'>购卡</view>  
51 - <view class='label_item' bindtap='delUser'>删除学员</view>  
52 - </view>  
53 - <view class='hint_info'>无绑定畅玩卡</view> 33 + <view class='label_item edit_btn' bindtap='editInfo' data-index="{{index}}">编辑学员信息</view>
  34 + <view class='label_item renewal_btn' bindtap='renewalInfo' wx:if="{{item.is_end === 1}}">续卡</view>
  35 + <view class='label_item renewal_btn' bindtap='buyCard' wx:if="{{item.is_end === 2}}">购卡</view>
  36 +
  37 + <view class='label_item' bindtap='delStudent' data-index="{{index}}">删除学员</view>
  38 + </view>
  39 + <view class='hint_info' wx:if="{{item.is_end === 1}}">畅玩卡周期：{{item.time}}</view>
  40 + <view class='hint_info' wx:if="{{item.is_end === 2}}">无绑定畅玩卡</view>
54 </view> 41 </view>
55 </view> 42 </view>