miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 202e91fbe87b18f3a386acdfd9cc540348ff84c1 1 个父辈 cbfe605b

申诉详情，二次申诉

内嵌 并排对比
正在显示 11 个修改的文件 包含 493 行增加 和 401 行删除
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <project version="4"> 2 <project version="4">
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 - <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="优化打卡，由每次进入打卡页面弹框授权改为点击一键打卡再弹框授权"> 4 + <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/app.js" afterDir="false" />  
7 - <change beforePath="$PROJECT_DIR$/app.json" beforeDir="false" afterPath="$PROJECT_DIR$/app.json" afterDir="false" />  
8 - <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/clock/clock.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxml" afterDir="false" />  
10 <change beforePath="$PROJECT_DIR$/pages/clock/clock.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxss" afterDir="false" /> 6 <change beforePath="$PROJECT_DIR$/pages/clock/clock.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.wxss" afterDir="false" />
11 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" afterDir="false" /> 7 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" afterDir="false" />
12 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" afterDir="false" /> 8 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" afterDir="false" />
13 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" afterDir="false" /> 10 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" afterDir="false" />
14 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" afterDir="false" /> 11 <change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" afterDir="false" />
15 - <change beforePath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss" afterDir="false" />  
16 - <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" />  
17 - <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" />  
18 - <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" />  
19 - <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" />  
20 <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" />
21 - <change beforePath="$PROJECT_DIR$/pages/index/index.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxml" afterDir="false" />  
22 <change beforePath="$PROJECT_DIR$/pages/index/index.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxss" afterDir="false" /> 13 <change beforePath="$PROJECT_DIR$/pages/index/index.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/index.wxss" afterDir="false" />
23 - <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" />  
24 - <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" />  
25 - <change beforePath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" afterDir="false" />  
26 - <change beforePath="$PROJECT_DIR$/pages/my/my.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.js" afterDir="false" />  
27 - <change beforePath="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/myProfile/myProfile.js" afterDir="false" />  
28 - <change beforePath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js" afterDir="false" />  
29 - <change beforePath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml" afterDir="false" />  
30 - <change beforePath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxss" afterDir="false" />  
31 - <change beforePath="$PROJECT_DIR$/pages/start/start.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/start/start.js" afterDir="false" />  
32 - <change beforePath="$PROJECT_DIR$/templates/templates.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxml" afterDir="false" /> 14 + <change beforePath="$PROJECT_DIR$/pages/my/my.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/my.wxss" afterDir="false" />
  15 + <change beforePath="$PROJECT_DIR$/wxParse/html2json.js" beforeDir="false" afterPath="$PROJECT_DIR$/wxParse/html2json.js" afterDir="false" />
33 </list> 16 </list>
34 <ignored path="$PROJECT_DIR$/.tmp/" /> 17 <ignored path="$PROJECT_DIR$/.tmp/" />
35 <ignored path="$PROJECT_DIR$/temp/" /> 18 <ignored path="$PROJECT_DIR$/temp/" />
@@ -44,47 +27,47 @@ @@ -44,47 +27,47 @@
44 <session id="-381596063"> 27 <session id="-381596063">
45 <usages-collector id="statistics.lifecycle.project"> 28 <usages-collector id="statistics.lifecycle.project">
46 <counts> 29 <counts>
47 - <entry key="project.closed" value="14" />  
48 - <entry key="project.open.time.0" value="5" />  
49 - <entry key="project.open.time.1" value="6" /> 30 + <entry key="project.closed" value="16" />
  31 + <entry key="project.open.time.0" value="6" />
  32 + <entry key="project.open.time.1" value="7" />
50 <entry key="project.open.time.2" value="2" /> 33 <entry key="project.open.time.2" value="2" />
51 <entry key="project.open.time.8" value="2" /> 34 <entry key="project.open.time.8" value="2" />
52 <entry key="project.open.time.9" value="1" /> 35 <entry key="project.open.time.9" value="1" />
53 - <entry key="project.opened" value="16" /> 36 + <entry key="project.opened" value="18" />
54 </counts> 37 </counts>
55 </usages-collector> 38 </usages-collector>
56 <usages-collector id="statistics.file.extensions.open"> 39 <usages-collector id="statistics.file.extensions.open">
57 <counts> 40 <counts>
58 - <entry key="js" value="131" />  
59 - <entry key="json" value="30" />  
60 - <entry key="wxml" value="103" />  
61 - <entry key="wxss" value="43" /> 41 + <entry key="js" value="143" />
  42 + <entry key="json" value="31" />
  43 + <entry key="wxml" value="112" />
  44 + <entry key="wxss" value="49" />
62 </counts> 45 </counts>
63 </usages-collector> 46 </usages-collector>
64 <usages-collector id="statistics.file.types.open"> 47 <usages-collector id="statistics.file.types.open">
65 <counts> 48 <counts>
66 - <entry key="CSS" value="43" />  
67 - <entry key="HTML" value="103" />  
68 - <entry key="JSON" value="30" />  
69 - <entry key="JavaScript" value="131" /> 49 + <entry key="CSS" value="49" />
  50 + <entry key="HTML" value="112" />
  51 + <entry key="JSON" value="31" />
  52 + <entry key="JavaScript" value="143" />
70 </counts> 53 </counts>
71 </usages-collector> 54 </usages-collector>
72 <usages-collector id="statistics.file.extensions.edit"> 55 <usages-collector id="statistics.file.extensions.edit">
73 <counts> 56 <counts>
74 - <entry key="js" value="12969" /> 57 + <entry key="js" value="13513" />
75 <entry key="json" value="158" /> 58 <entry key="json" value="158" />
76 - <entry key="txt" value="231" />  
77 - <entry key="wxml" value="2873" />  
78 - <entry key="wxss" value="1439" /> 59 + <entry key="txt" value="279" />
  60 + <entry key="wxml" value="3146" />
  61 + <entry key="wxss" value="1477" />
79 </counts> 62 </counts>
80 </usages-collector> 63 </usages-collector>
81 <usages-collector id="statistics.file.types.edit"> 64 <usages-collector id="statistics.file.types.edit">
82 <counts> 65 <counts>
83 - <entry key="CSS" value="1439" />  
84 - <entry key="HTML" value="2873" /> 66 + <entry key="CSS" value="1477" />
  67 + <entry key="HTML" value="3146" />
85 <entry key="JSON" value="158" /> 68 <entry key="JSON" value="158" />
86 - <entry key="JavaScript" value="12969" />  
87 - <entry key="PLAIN_TEXT" value="231" /> 69 + <entry key="JavaScript" value="13513" />
  70 + <entry key="PLAIN_TEXT" value="279" />
88 </counts> 71 </counts>
89 </usages-collector> 72 </usages-collector>
90 </session> 73 </session>
@@ -92,100 +75,104 @@ @@ -92,100 +75,104 @@
92 <component name="FileEditorManager"> 75 <component name="FileEditorManager">
93 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 76 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
94 <file pinned="false" current-in-tab="false"> 77 <file pinned="false" current-in-tab="false">
95 - <entry file="file://$PROJECT_DIR$/pages/index/index.js"> 78 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
96 <provider selected="true" editor-type-id="text-editor"> 79 <provider selected="true" editor-type-id="text-editor">
97 - <state relative-caret-position="968">  
98 - <caret line="44" selection-start-line="44" selection-end-line="47" selection-end-column="6" /> 80 + <state relative-caret-position="506">
  81 + <caret line="94" column="10" lean-forward="true" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
99 <folding> 82 <folding>
100 - <element signature="n#!!doc" expanded="true" />  
101 - <element signature="e#3441#6499#0" />  
102 - <element signature="e#6947#8019#0" /> 83 + <element signature="e#1652#2617#0" />
103 </folding> 84 </folding>
104 </state> 85 </state>
105 </provider> 86 </provider>
106 </entry> 87 </entry>
107 </file> 88 </file>
108 <file pinned="false" current-in-tab="false"> 89 <file pinned="false" current-in-tab="false">
109 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js"> 90 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
110 <provider selected="true" editor-type-id="text-editor"> 91 <provider selected="true" editor-type-id="text-editor">
111 - <state relative-caret-position="616">  
112 - <caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" /> 92 + <state relative-caret-position="154">
  93 + <caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
113 </state> 94 </state>
114 </provider> 95 </provider>
115 </entry> 96 </entry>
116 </file> 97 </file>
117 <file pinned="false" current-in-tab="false"> 98 <file pinned="false" current-in-tab="false">
118 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml"> 99 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
119 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
120 <state relative-caret-position="66"> 101 <state relative-caret-position="66">
121 - <caret line="3" column="69" selection-start-line="3" selection-start-column="58" selection-end-line="3" selection-end-column="69" /> 102 + <caret line="3" column="43" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="43" />
  103 + <folding>
  104 + <element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
  105 + </folding>
122 </state> 106 </state>
123 </provider> 107 </provider>
124 </entry> 108 </entry>
125 </file> 109 </file>
126 <file pinned="false" current-in-tab="false"> 110 <file pinned="false" current-in-tab="false">
127 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxss"> 111 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
128 <provider selected="true" editor-type-id="text-editor"> 112 <provider selected="true" editor-type-id="text-editor">
129 - <state relative-caret-position="198">  
130 - <caret line="9" selection-start-line="9" selection-end-line="18" selection-end-column="1" /> 113 + <state relative-caret-position="1518">
  114 + <caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
  115 + <folding>
  116 + <element signature="e#152#1691#0" />
  117 + </folding>
131 </state> 118 </state>
132 </provider> 119 </provider>
133 </entry> 120 </entry>
134 </file> 121 </file>
135 - <file pinned="false" current-in-tab="true">  
136 - <entry file="file://$PROJECT_DIR$/app.js"> 122 + <file pinned="false" current-in-tab="false">
  123 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
137 <provider selected="true" editor-type-id="text-editor"> 124 <provider selected="true" editor-type-id="text-editor">
138 - <state relative-caret-position="264">  
139 - <caret line="55" column="59" selection-start-line="55" selection-start-column="59" selection-end-line="55" selection-end-column="59" />  
140 - <folding>  
141 - <element signature="e#76#1092#0" />  
142 - <element signature="e#4307#4566#0" />  
143 - <element signature="e#4595#5101#0" />  
144 - <element signature="e#5118#5452#0" />  
145 - <element signature="e#5495#5588#0" />  
146 - <element signature="e#5610#5695#0" />  
147 - </folding> 125 + <state relative-caret-position="455">
  126 + <caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
148 </state> 127 </state>
149 </provider> 128 </provider>
150 </entry> 129 </entry>
151 </file> 130 </file>
152 <file pinned="false" current-in-tab="false"> 131 <file pinned="false" current-in-tab="false">
153 - <entry file="file://$PROJECT_DIR$/templates/templates.wxml"> 132 + <entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
154 <provider selected="true" editor-type-id="text-editor"> 133 <provider selected="true" editor-type-id="text-editor">
155 - <state relative-caret-position="1804">  
156 - <caret line="82" selection-start-line="82" selection-end-line="82" selection-end-column="11" /> 134 + <state relative-caret-position="550">
  135 + <caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
157 </state> 136 </state>
158 </provider> 137 </provider>
159 </entry> 138 </entry>
160 </file> 139 </file>
161 <file pinned="false" current-in-tab="false"> 140 <file pinned="false" current-in-tab="false">
162 - <entry file="file://$PROJECT_DIR$/project.config.json"> 141 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
163 <provider selected="true" editor-type-id="text-editor"> 142 <provider selected="true" editor-type-id="text-editor">
164 - <state relative-caret-position="748">  
165 - <caret line="34" column="26" lean-forward="true" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" /> 143 + <state relative-caret-position="558">
  144 + <caret line="102" column="57" lean-forward="true" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />
166 </state> 145 </state>
167 </provider> 146 </provider>
168 </entry> 147 </entry>
169 </file> 148 </file>
170 - <file pinned="false" current-in-tab="false">  
171 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">  
172 - <provider selected="true" editor-type-id="text-editor" /> 149 + <file pinned="false" current-in-tab="true">
  150 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
  151 + <provider selected="true" editor-type-id="text-editor">
  152 + <state relative-caret-position="608">
  153 + <caret line="143" selection-start-line="143" selection-end-line="143" />
  154 + <folding>
  155 + <element signature="e#1398#2534#0" />
  156 + <element signature="e#2559#3773#0" />
  157 + </folding>
  158 + </state>
  159 + </provider>
173 </entry> 160 </entry>
174 </file> 161 </file>
175 <file pinned="false" current-in-tab="false"> 162 <file pinned="false" current-in-tab="false">
176 - <entry file="file://$PROJECT_DIR$/pages/start/start.wxml"> 163 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
177 <provider selected="true" editor-type-id="text-editor"> 164 <provider selected="true" editor-type-id="text-editor">
178 - <state relative-caret-position="242">  
179 - <caret line="11" selection-end-line="11" /> 165 + <state relative-caret-position="22">
  166 + <caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
180 </state> 167 </state>
181 </provider> 168 </provider>
182 </entry> 169 </entry>
183 </file> 170 </file>
184 <file pinned="false" current-in-tab="false"> 171 <file pinned="false" current-in-tab="false">
185 - <entry file="file://$PROJECT_DIR$/pages/start/start.js"> 172 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
186 <provider selected="true" editor-type-id="text-editor"> 173 <provider selected="true" editor-type-id="text-editor">
187 - <state relative-caret-position="176">  
188 - <caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="9" selection-end-column="24" /> 174 + <state relative-caret-position="462">
  175 + <caret line="120" column="8" lean-forward="true" selection-start-line="120" selection-start-column="8" selection-end-line="130" selection-end-column="28" />
189 </state> 176 </state>
190 </provider> 177 </provider>
191 </entry> 178 </entry>
@@ -194,18 +181,6 @@ @@ -194,18 +181,6 @@
194 </component> 181 </component>
195 <component name="FindInProjectRecents"> 182 <component name="FindInProjectRecents">
196 <findStrings> 183 <findStrings>
197 - <find>changeTab</find>  
198 - <find>previewImage</find>  
199 - <find>listDetail</find>  
200 - <find>test</find>  
201 - <find>postPosition</find>  
202 - <find>page</find>  
203 - <find>city_list</find>  
204 - <find>is_this_week</find>  
205 - <find>ordered</find>  
206 - <find>is_past</find>  
207 - <find>now</find>  
208 - <find>info</find>  
209 <find>getSlideImage</find> 184 <find>getSlideImage</find>
210 <find>punch</find> 185 <find>punch</find>
211 <find>xxx</find> 186 <find>xxx</find>
@@ -216,14 +191,26 @@ @@ -216,14 +191,26 @@
216 <find>chooseChildren</find> 191 <find>chooseChildren</find>
217 <find>session_info</find> 192 <find>session_info</find>
218 <find>getAppointmentInfo</find> 193 <find>getAppointmentInfo</find>
219 - <find>is_bingding</find>  
220 <find>swiperChange</find> 194 <find>swiperChange</find>
221 - <find>currentSwiper</find>  
222 <find>wrap</find> 195 <find>wrap</find>
223 <find>cur</find> 196 <find>cur</find>
224 <find>current</find> 197 <find>current</find>
225 <find>getExperiment</find> 198 <find>getExperiment</find>
226 <find>goPhoneCode</find> 199 <find>goPhoneCode</find>
  200 + <find>console.dir</find>
  201 + <find>city_index</find>
  202 + <find>sex_index</find>
  203 + <find>is_sex_change</find>
  204 + <find>template</find>
  205 + <find>is_birth_change</find>
  206 + <find>form</find>
  207 + <find>tabCharge</find>
  208 + <find>currentSwiper</find>
  209 + <find>listDetail</find>
  210 + <find>submit_btn</find>
  211 + <find>modal</find>
  212 + <find>is_bingding</find>
  213 + <find>getAppointmentList</find>
227 </findStrings> 214 </findStrings>
228 </component> 215 </component>
229 <component name="Git.Settings"> 216 <component name="Git.Settings">
@@ -232,8 +219,6 @@ @@ -232,8 +219,6 @@
232 <component name="IdeDocumentHistory"> 219 <component name="IdeDocumentHistory">
233 <option name="CHANGED_PATHS"> 220 <option name="CHANGED_PATHS">
234 <list> 221 <list>
235 - <option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml" />  
236 - <option value="$PROJECT_DIR$/pages/my/edit-student/edit-student.wxss" />  
237 <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.json" /> 222 <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.json" />
238 <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" /> 223 <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxml" />
239 <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxss" /> 224 <option value="$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.wxss" />
@@ -264,25 +249,27 @@ @@ -264,25 +249,27 @@
264 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" /> 249 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml" />
265 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" /> 250 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js" />
266 <option value="$PROJECT_DIR$/app.js" /> 251 <option value="$PROJECT_DIR$/app.js" />
267 - <option value="$PROJECT_DIR$/pages/index/index.wxss" />  
268 <option value="$PROJECT_DIR$/pages/my/my.js" /> 252 <option value="$PROJECT_DIR$/pages/my/my.js" />
269 <option value="$PROJECT_DIR$/pages/my/my.wxml" /> 253 <option value="$PROJECT_DIR$/pages/my/my.wxml" />
270 - <option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" />  
271 - <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />  
272 - <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />  
273 - <option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" />  
274 <option value="$PROJECT_DIR$/templates/templates.wxml" /> 254 <option value="$PROJECT_DIR$/templates/templates.wxml" />
275 <option value="$PROJECT_DIR$/pages/clock/clock.wxml" /> 255 <option value="$PROJECT_DIR$/pages/clock/clock.wxml" />
276 <option value="$PROJECT_DIR$/pages/clock/clock.js" /> 256 <option value="$PROJECT_DIR$/pages/clock/clock.js" />
277 <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" /> 257 <option value="$PROJECT_DIR$/pages/index/phone-code/phone-code.js" />
278 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" /> 258 <option value="$PROJECT_DIR$/pages/my/buyCard/buyCard.js" />
279 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" /> 259 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
280 - <option value="$PROJECT_DIR$/pages/clock/clock.wxss" />  
281 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" /> 260 <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
282 <option value="$PROJECT_DIR$/app.json" /> 261 <option value="$PROJECT_DIR$/app.json" />
283 <option value="$PROJECT_DIR$/pages/start/start.js" /> 262 <option value="$PROJECT_DIR$/pages/start/start.js" />
284 <option value="$PROJECT_DIR$/pages/index/index.wxml" /> 263 <option value="$PROJECT_DIR$/pages/index/index.wxml" />
285 <option value="$PROJECT_DIR$/pages/index/index.js" /> 264 <option value="$PROJECT_DIR$/pages/index/index.js" />
  265 + <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml" />
  266 + <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss" />
  267 + <option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js" />
  268 + <option value="$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml" />
  269 + <option value="$PROJECT_DIR$/pages/index/index.wxss" />
  270 + <option value="$PROJECT_DIR$/pages/clock/clock.wxss" />
  271 + <option value="$PROJECT_DIR$/pages/my/my.wxss" />
  272 + <option value="$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js" />
286 </list> 273 </list>
287 </option> 274 </option>
288 </component> 275 </component>
@@ -293,7 +280,8 @@ @@ -293,7 +280,8 @@
293 <sorting>DEFINITION_ORDER</sorting> 280 <sorting>DEFINITION_ORDER</sorting>
294 </component> 281 </component>
295 <component name="ProjectFrameBounds" extendedState="6"> 282 <component name="ProjectFrameBounds" extendedState="6">
296 - <option name="x" value="-8" /> 283 + <option name="x" value="-3" />
  284 + <option name="y" value="1" />
297 <option name="width" value="1936" /> 285 <option name="width" value="1936" />
298 <option name="height" value="1047" /> 286 <option name="height" value="1047" />
299 </component> 287 </component>
@@ -319,30 +307,54 @@ @@ -319,30 +307,54 @@
319 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 307 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
320 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 308 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
321 <item name="pages" type="462c0819:PsiDirectoryNode" /> 309 <item name="pages" type="462c0819:PsiDirectoryNode" />
322 - <item name="index" type="462c0819:PsiDirectoryNode" /> 310 + <item name="clock" type="462c0819:PsiDirectoryNode" />
  311 + </path>
  312 + <path>
  313 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  314 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  315 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  316 + <item name="clock" type="462c0819:PsiDirectoryNode" />
  317 + <item name="punchAppeal" type="462c0819:PsiDirectoryNode" />
  318 + </path>
  319 + <path>
  320 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  321 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  322 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  323 + <item name="clock" type="462c0819:PsiDirectoryNode" />
  324 + <item name="punchAppealDetail" type="462c0819:PsiDirectoryNode" />
  325 + </path>
  326 + <path>
  327 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  328 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  329 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  330 + <item name="clock" type="462c0819:PsiDirectoryNode" />
  331 + <item name="punchAppealDetail2" type="462c0819:PsiDirectoryNode" />
323 </path> 332 </path>
324 <path> 333 <path>
325 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 334 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
326 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 335 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
327 <item name="pages" type="462c0819:PsiDirectoryNode" /> 336 <item name="pages" type="462c0819:PsiDirectoryNode" />
328 <item name="index" type="462c0819:PsiDirectoryNode" /> 337 <item name="index" type="462c0819:PsiDirectoryNode" />
329 - <item name="phone-code" type="462c0819:PsiDirectoryNode" />  
330 </path> 338 </path>
331 <path> 339 <path>
332 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 340 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
333 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 341 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
334 <item name="pages" type="462c0819:PsiDirectoryNode" /> 342 <item name="pages" type="462c0819:PsiDirectoryNode" />
335 - <item name="start" type="462c0819:PsiDirectoryNode" /> 343 + <item name="index" type="462c0819:PsiDirectoryNode" />
  344 + <item name="activity-detail" type="462c0819:PsiDirectoryNode" />
336 </path> 345 </path>
337 <path> 346 <path>
338 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 347 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
339 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 348 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
340 - <item name="templates" type="462c0819:PsiDirectoryNode" /> 349 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  350 + <item name="my" type="462c0819:PsiDirectoryNode" />
341 </path> 351 </path>
342 <path> 352 <path>
343 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 353 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
344 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 354 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
345 - <item name="utils" type="462c0819:PsiDirectoryNode" /> 355 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  356 + <item name="my" type="462c0819:PsiDirectoryNode" />
  357 + <item name="all-appointment" type="462c0819:PsiDirectoryNode" />
346 </path> 358 </path>
347 </expand> 359 </expand>
348 <select /> 360 <select />
@@ -351,8 +363,9 @@ @@ -351,8 +363,9 @@
351 </panes> 363 </panes>
352 </component> 364 </component>
353 <component name="PropertiesComponent"> 365 <component name="PropertiesComponent">
  366 + <property name="SearchEverywhereHistoryKey" value="edit&#9;FILE&#9;file://D:/小程序/scienceCaptain/ScienceCaptain/pages/my/edit-student/edit-student.js" />
354 <property name="WebServerToolWindowFactoryState" value="false" /> 367 <property name="WebServerToolWindowFactoryState" value="false" />
355 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../../遛狗小程序" /> 368 + <property name="last_opened_file_path" value="$PROJECT_DIR$" />
356 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 369 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
357 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 370 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
358 <property name="settings.editor.selected.configurable" value="project.propDebugger" /> 371 <property name="settings.editor.selected.configurable" value="project.propDebugger" />
@@ -401,7 +414,9 @@ @@ -401,7 +414,9 @@
401 <workItem from="1544430037915" duration="11000" /> 414 <workItem from="1544430037915" duration="11000" />
402 <workItem from="1544430133354" duration="7787000" /> 415 <workItem from="1544430133354" duration="7787000" />
403 <workItem from="1544490574837" duration="15199000" /> 416 <workItem from="1544490574837" duration="15199000" />
404 - <workItem from="1544579843898" duration="2170000" /> 417 + <workItem from="1544579843898" duration="5821000" />
  418 + <workItem from="1544751555564" duration="3866000" />
  419 + <workItem from="1545014617044" duration="7283000" />
405 </task> 420 </task>
406 <task id="LOCAL-00001" summary="modal 模板"> 421 <task id="LOCAL-00001" summary="modal 模板">
407 <created>1542274356914</created> 422 <created>1542274356914</created>
@@ -452,11 +467,18 @@ @@ -452,11 +467,18 @@
452 <option name="project" value="LOCAL" /> 467 <option name="project" value="LOCAL" />
453 <updated>1544255230736</updated> 468 <updated>1544255230736</updated>
454 </task> 469 </task>
455 - <option name="localTasksCounter" value="8" /> 470 + <task id="LOCAL-00008" summary="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，">
  471 + <created>1544583498325</created>
  472 + <option name="number" value="00008" />
  473 + <option name="presentableId" value="LOCAL-00008" />
  474 + <option name="project" value="LOCAL" />
  475 + <updated>1544583498325</updated>
  476 + </task>
  477 + <option name="localTasksCounter" value="9" />
456 <servers /> 478 <servers />
457 </component> 479 </component>
458 <component name="TimeTrackingManager"> 480 <component name="TimeTrackingManager">
459 - <option name="totallyTimeSpent" value="182710000" /> 481 + <option name="totallyTimeSpent" value="197510000" />
460 </component> 482 </component>
461 <component name="ToolWindowManager"> 483 <component name="ToolWindowManager">
462 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 484 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -475,7 +497,7 @@ @@ -475,7 +497,7 @@
475 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 497 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
476 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" /> 498 <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
477 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" /> 499 <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" weight="0.329718" />
478 - <window_info anchor="bottom" id="Version Control" order="10" weight="0.5796316" /> 500 + <window_info anchor="bottom" id="Version Control" order="10" weight="0.5791757" />
479 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 501 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
480 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 502 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
481 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 503 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
@@ -521,368 +543,360 @@ @@ -521,368 +543,360 @@
521 <MESSAGE value="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid" /> 543 <MESSAGE value="确认预约信息，选择学员，优化单人预约，购买畅玩卡，添加预约详情页底部状态按钮，更换为客户appid" />
522 <MESSAGE value="申诉，打卡，编辑删除学员，更换手机号" /> 544 <MESSAGE value="申诉，打卡，编辑删除学员，更换手机号" />
523 <MESSAGE value="预约详情页接口，删除学员，添加formid" /> 545 <MESSAGE value="预约详情页接口，删除学员，添加formid" />
524 - <option name="LAST_COMMIT_MESSAGE" value="预约详情页接口，删除学员，添加formid" /> 546 + <MESSAGE value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
  547 + <option name="LAST_COMMIT_MESSAGE" value="申诉上传图片，优化弹框模板，添加学员调用城市列表，添加订单上拉加载，全局判断是否绑定手机号，" />
525 </component> 548 </component>
526 <component name="editorHistoryManager"> 549 <component name="editorHistoryManager">
527 - <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.wxml"> 550 + <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js">
528 <provider selected="true" editor-type-id="text-editor"> 551 <provider selected="true" editor-type-id="text-editor">
529 - <state relative-caret-position="-140">  
530 - <caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" /> 552 + <state relative-caret-position="396">
  553 + <caret line="165" column="8" selection-start-line="165" selection-start-column="8" selection-end-line="180" selection-end-column="11" />
531 </state> 554 </state>
532 </provider> 555 </provider>
533 </entry> 556 </entry>
534 - <entry file="file://$PROJECT_DIR$/pages/my/charge/charge.js">  
535 - <provider selected="true" editor-type-id="text-editor">  
536 - <state relative-caret-position="572">  
537 - <caret line="59" column="30" lean-forward="true" selection-start-line="59" selection-start-column="30" selection-end-line="59" selection-end-column="30" />  
538 - </state>  
539 - </provider> 557 + <entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.json">
  558 + <provider selected="true" editor-type-id="text-editor" />
540 </entry> 559 </entry>
541 - <entry file="file://$PROJECT_DIR$/pages/my/chargePhoneNum/chargePhoneNum.js">  
542 - <provider selected="true" editor-type-id="text-editor">  
543 - <state relative-caret-position="440">  
544 - <caret line="173" column="48" lean-forward="true" selection-start-line="173" selection-start-column="48" selection-end-line="173" selection-end-column="48" />  
545 - </state>  
546 - </provider> 560 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxss">
  561 + <provider selected="true" editor-type-id="text-editor" />
547 </entry> 562 </entry>
548 - <entry file="file://$PROJECT_DIR$/app.wxss"> 563 + <entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js">
549 <provider selected="true" editor-type-id="text-editor"> 564 <provider selected="true" editor-type-id="text-editor">
550 - <state relative-caret-position="377">  
551 - <caret line="39" column="19" selection-start-line="39" selection-start-column="19" selection-end-line="39" selection-end-column="19" /> 565 + <state relative-caret-position="462">
  566 + <caret line="22" selection-start-line="22" selection-end-line="23" />
  567 + <folding>
  568 + <element signature="n#!!doc" expanded="true" />
  569 + </folding>
552 </state> 570 </state>
553 </provider> 571 </provider>
554 </entry> 572 </entry>
555 - <entry file="file://$PROJECT_DIR$/templates/templates.wxss"> 573 + <entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml">
556 <provider selected="true" editor-type-id="text-editor"> 574 <provider selected="true" editor-type-id="text-editor">
557 - <state relative-caret-position="775">  
558 - <caret line="180" column="29" selection-start-line="180" selection-start-column="29" selection-end-line="180" selection-end-column="29" /> 575 + <state relative-caret-position="66">
  576 + <caret line="3" column="60" selection-start-line="3" selection-start-column="60" selection-end-line="3" selection-end-column="60" />
559 </state> 577 </state>
560 </provider> 578 </provider>
561 </entry> 579 </entry>
562 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxss"> 580 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
563 <provider selected="true" editor-type-id="text-editor"> 581 <provider selected="true" editor-type-id="text-editor">
564 - <state relative-caret-position="110">  
565 - <caret line="5" column="15" selection-start-line="5" selection-start-column="15" selection-end-line="5" selection-end-column="15" /> 582 + <state relative-caret-position="276">
  583 + <caret line="226" selection-start-line="226" selection-end-line="247" selection-end-column="4" />
566 </state> 584 </state>
567 </provider> 585 </provider>
568 </entry> 586 </entry>
569 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxss"> 587 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml">
570 <provider selected="true" editor-type-id="text-editor"> 588 <provider selected="true" editor-type-id="text-editor">
571 - <state relative-caret-position="302">  
572 - <caret line="67" column="15" lean-forward="true" selection-start-line="67" selection-start-column="15" selection-end-line="67" selection-end-column="15" /> 589 + <state relative-caret-position="462">
  590 + <caret line="36" column="68" lean-forward="true" selection-start-line="36" selection-start-column="68" selection-end-line="36" selection-end-column="68" />
573 </state> 591 </state>
574 </provider> 592 </provider>
575 </entry> 593 </entry>
576 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss"> 594 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js">
577 <provider selected="true" editor-type-id="text-editor"> 595 <provider selected="true" editor-type-id="text-editor">
578 - <state relative-caret-position="500">  
579 - <caret line="154" column="21" selection-start-line="154" selection-start-column="21" selection-end-line="154" selection-end-column="21" /> 596 + <state relative-caret-position="-44">
  597 + <caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" />
580 </state> 598 </state>
581 </provider> 599 </provider>
582 </entry> 600 </entry>
583 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">  
584 - <provider selected="true" editor-type-id="text-editor">  
585 - <state relative-caret-position="110">  
586 - <caret line="5" column="51" selection-start-line="5" selection-start-column="51" selection-end-line="5" selection-end-column="51" />  
587 - </state>  
588 - </provider> 601 + <entry file="file://$PROJECT_DIR$/pages/index/index.json">
  602 + <provider selected="true" editor-type-id="text-editor" />
589 </entry> 603 </entry>
590 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.wxml"> 604 + <entry file="file://$PROJECT_DIR$/app.json">
591 <provider selected="true" editor-type-id="text-editor"> 605 <provider selected="true" editor-type-id="text-editor">
592 - <state relative-caret-position="1518">  
593 - <caret line="69" column="58" selection-start-line="69" selection-start-column="58" selection-end-line="69" selection-end-column="58" /> 606 + <state relative-caret-position="88">
  607 + <caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" />
594 </state> 608 </state>
595 </provider> 609 </provider>
596 </entry> 610 </entry>
597 - <entry file="file://$PROJECT_DIR$/pages/my/order-detail/order-detail.js"> 611 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
598 <provider selected="true" editor-type-id="text-editor"> 612 <provider selected="true" editor-type-id="text-editor">
599 - <state relative-caret-position="396">  
600 - <caret line="165" column="8" selection-start-line="165" selection-start-column="8" selection-end-line="180" selection-end-column="11" /> 613 + <state relative-caret-position="1012">
  614 + <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" />
601 </state> 615 </state>
602 </provider> 616 </provider>
603 </entry> 617 </entry>
604 - <entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.json">  
605 - <provider selected="true" editor-type-id="text-editor" />  
606 - </entry>  
607 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxml"> 618 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
608 <provider selected="true" editor-type-id="text-editor"> 619 <provider selected="true" editor-type-id="text-editor">
609 - <state relative-caret-position="484">  
610 - <caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" /> 620 + <state relative-caret-position="431">
  621 + <caret line="272" column="9" lean-forward="true" selection-start-line="272" selection-start-column="9" selection-end-line="272" selection-end-column="9" />
611 </state> 622 </state>
612 </provider> 623 </provider>
613 </entry> 624 </entry>
614 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxss">  
615 - <provider selected="true" editor-type-id="text-editor" />  
616 - </entry>  
617 - <entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.js"> 625 + <entry file="file://$PROJECT_DIR$/pages/my/my.js">
618 <provider selected="true" editor-type-id="text-editor"> 626 <provider selected="true" editor-type-id="text-editor">
619 - <state relative-caret-position="462">  
620 - <caret line="22" selection-start-line="22" selection-end-line="23" />  
621 - <folding>  
622 - <element signature="n#!!doc" expanded="true" />  
623 - </folding> 627 + <state relative-caret-position="594">
  628 + <caret line="96" column="64" lean-forward="true" selection-start-line="96" selection-start-column="64" selection-end-line="96" selection-end-column="64" />
624 </state> 629 </state>
625 </provider> 630 </provider>
626 </entry> 631 </entry>
627 - <entry file="file://$PROJECT_DIR$/pages/my/serviceWeChat/serviceWeChat.wxml"> 632 + <entry file="file://$PROJECT_DIR$/pages/my/my.wxml">
628 <provider selected="true" editor-type-id="text-editor"> 633 <provider selected="true" editor-type-id="text-editor">
629 - <state relative-caret-position="66">  
630 - <caret line="3" column="60" selection-start-line="3" selection-start-column="60" selection-end-line="3" selection-end-column="60" /> 634 + <state relative-caret-position="132">
  635 + <caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" />
631 </state> 636 </state>
632 </provider> 637 </provider>
633 </entry> 638 </entry>
634 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss"> 639 + <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js">
635 <provider selected="true" editor-type-id="text-editor"> 640 <provider selected="true" editor-type-id="text-editor">
636 - <state relative-caret-position="396">  
637 - <caret line="18" column="25" selection-start-line="18" selection-start-column="25" selection-end-line="18" selection-end-column="25" /> 641 + <state relative-caret-position="432">
  642 + <caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" />
638 </state> 643 </state>
639 </provider> 644 </provider>
640 </entry> 645 </entry>
641 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss"> 646 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.json">
642 <provider selected="true" editor-type-id="text-editor"> 647 <provider selected="true" editor-type-id="text-editor">
643 - <state relative-caret-position="704">  
644 - <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" /> 648 + <state relative-caret-position="44">
  649 + <caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" />
645 </state> 650 </state>
646 </provider> 651 </provider>
647 </entry> 652 </entry>
648 - <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js"> 653 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
649 <provider selected="true" editor-type-id="text-editor"> 654 <provider selected="true" editor-type-id="text-editor">
650 - <state relative-caret-position="1100">  
651 - <caret line="116" column="76" lean-forward="true" selection-start-line="116" selection-start-column="76" selection-end-line="116" selection-end-column="76" /> 655 + <state relative-caret-position="176">
  656 + <caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" />
652 </state> 657 </state>
653 </provider> 658 </provider>
654 </entry> 659 </entry>
655 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js"> 660 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
656 <provider selected="true" editor-type-id="text-editor"> 661 <provider selected="true" editor-type-id="text-editor">
657 - <state relative-caret-position="276">  
658 - <caret line="226" selection-start-line="226" selection-end-line="247" selection-end-column="4" /> 662 + <state relative-caret-position="638">
  663 + <caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" />
659 </state> 664 </state>
660 </provider> 665 </provider>
661 </entry> 666 </entry>
662 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.wxml"> 667 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js">
663 <provider selected="true" editor-type-id="text-editor"> 668 <provider selected="true" editor-type-id="text-editor">
664 - <state relative-caret-position="462">  
665 - <caret line="36" column="68" lean-forward="true" selection-start-line="36" selection-start-column="68" selection-end-line="36" selection-end-column="68" /> 669 + <state relative-caret-position="1936">
  670 + <caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" />
666 </state> 671 </state>
667 </provider> 672 </provider>
668 </entry> 673 </entry>
669 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/add-student/add-student.js"> 674 + <entry file="file://$PROJECT_DIR$/app.js">
670 <provider selected="true" editor-type-id="text-editor"> 675 <provider selected="true" editor-type-id="text-editor">
671 - <state relative-caret-position="-44">  
672 - <caret line="91" column="36" selection-start-line="91" selection-start-column="36" selection-end-line="91" selection-end-column="36" /> 676 + <state relative-caret-position="2112">
  677 + <caret line="164" column="19" selection-start-line="164" selection-start-column="8" selection-end-line="164" selection-end-column="19" />
  678 + <folding>
  679 + <element signature="e#76#1092#0" />
  680 + <element signature="e#4307#4566#0" />
  681 + <element signature="e#4595#5101#0" />
  682 + <element signature="e#5118#5452#0" />
  683 + <element signature="e#5495#5588#0" />
  684 + <element signature="e#5610#5695#0" />
  685 + </folding>
673 </state> 686 </state>
674 </provider> 687 </provider>
675 </entry> 688 </entry>
676 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js"> 689 + <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
677 <provider selected="true" editor-type-id="text-editor"> 690 <provider selected="true" editor-type-id="text-editor">
678 - <state relative-caret-position="550">  
679 - <caret line="99" selection-start-line="99" selection-end-line="100" /> 691 + <state relative-caret-position="1804">
  692 + <caret line="82" selection-start-line="82" selection-end-line="82" selection-end-column="11" />
680 </state> 693 </state>
681 </provider> 694 </provider>
682 </entry> 695 </entry>
683 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml"> 696 + <entry file="file://$PROJECT_DIR$/project.config.json">
684 <provider selected="true" editor-type-id="text-editor"> 697 <provider selected="true" editor-type-id="text-editor">
685 - <state relative-caret-position="608">  
686 - <caret line="34" column="42" lean-forward="true" selection-start-line="34" selection-start-column="42" selection-end-line="34" selection-end-column="42" /> 698 + <state relative-caret-position="748">
  699 + <caret line="34" column="26" lean-forward="true" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" />
687 </state> 700 </state>
688 </provider> 701 </provider>
689 </entry> 702 </entry>
690 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">  
691 - <provider selected="true" editor-type-id="text-editor">  
692 - <state relative-caret-position="-140">  
693 - <caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />  
694 - </state>  
695 - </provider> 703 + <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">
  704 + <provider selected="true" editor-type-id="text-editor" />
696 </entry> 705 </entry>
697 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml"> 706 + <entry file="file://$PROJECT_DIR$/pages/start/start.wxml">
698 <provider selected="true" editor-type-id="text-editor"> 707 <provider selected="true" editor-type-id="text-editor">
699 - <state relative-caret-position="440">  
700 - <caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" /> 708 + <state relative-caret-position="242">
  709 + <caret line="11" selection-end-line="11" />
701 </state> 710 </state>
702 </provider> 711 </provider>
703 </entry> 712 </entry>
704 - <entry file="file://$PROJECT_DIR$/pages/index/index.json">  
705 - <provider selected="true" editor-type-id="text-editor" />  
706 - </entry>  
707 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js"> 713 + <entry file="file://$PROJECT_DIR$/pages/start/start.js">
708 <provider selected="true" editor-type-id="text-editor"> 714 <provider selected="true" editor-type-id="text-editor">
709 - <state relative-caret-position="2156">  
710 - <caret line="126" column="21" lean-forward="true" selection-start-line="126" selection-start-column="21" selection-end-line="126" selection-end-column="21" /> 715 + <state relative-caret-position="594">
  716 + <caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
711 </state> 717 </state>
712 </provider> 718 </provider>
713 </entry> 719 </entry>
714 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js"> 720 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.js">
715 <provider selected="true" editor-type-id="text-editor"> 721 <provider selected="true" editor-type-id="text-editor">
716 - <state relative-caret-position="396">  
717 - <caret line="36" column="37" selection-start-line="36" selection-start-column="37" selection-end-line="36" selection-end-column="37" /> 722 + <state relative-caret-position="1254">
  723 + <caret line="57" column="27" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="27" />
718 </state> 724 </state>
719 </provider> 725 </provider>
720 </entry> 726 </entry>
721 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss"> 727 + <entry file="file://$PROJECT_DIR$/pages/my/edit-student/edit-student.wxml">
722 <provider selected="true" editor-type-id="text-editor"> 728 <provider selected="true" editor-type-id="text-editor">
723 - <state relative-caret-position="704">  
724 - <caret line="32" column="14" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" /> 729 + <state relative-caret-position="594">
  730 + <caret line="27" column="51" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />
725 </state> 731 </state>
726 </provider> 732 </provider>
727 </entry> 733 </entry>
728 - <entry file="file://$PROJECT_DIR$/app.json"> 734 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
729 <provider selected="true" editor-type-id="text-editor"> 735 <provider selected="true" editor-type-id="text-editor">
730 - <state relative-caret-position="88">  
731 - <caret line="4" column="43" selection-start-line="4" selection-start-column="43" selection-end-line="4" selection-end-column="43" /> 736 + <state relative-caret-position="352">
  737 + <caret line="16" column="6" lean-forward="true" selection-start-line="16" selection-start-column="6" selection-end-line="17" selection-end-column="67" />
732 </state> 738 </state>
733 </provider> 739 </provider>
734 </entry> 740 </entry>
735 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml"> 741 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.js">
736 <provider selected="true" editor-type-id="text-editor"> 742 <provider selected="true" editor-type-id="text-editor">
737 <state relative-caret-position="22"> 743 <state relative-caret-position="22">
738 - <caret line="1" column="58" selection-start-line="1" selection-start-column="58" selection-end-line="1" selection-end-column="58" />  
739 - <folding>  
740 - <element signature="n#style#0;n#view#0;n#!!top" expanded="true" />  
741 - </folding> 744 + <caret line="1" column="32" selection-start-line="1" selection-start-column="32" selection-end-line="1" selection-end-column="32" />
742 </state> 745 </state>
743 </provider> 746 </provider>
744 </entry> 747 </entry>
745 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml"> 748 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
746 <provider selected="true" editor-type-id="text-editor"> 749 <provider selected="true" editor-type-id="text-editor">
747 - <state relative-caret-position="1012">  
748 - <caret line="46" column="23" lean-forward="true" selection-start-line="46" selection-start-column="23" selection-end-line="46" selection-end-column="23" /> 750 + <state relative-caret-position="440">
  751 + <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
749 </state> 752 </state>
750 </provider> 753 </provider>
751 </entry> 754 </entry>
752 - <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js"> 755 + <entry file="file://$PROJECT_DIR$/wxParse/html2json.js">
  756 + <provider selected="true" editor-type-id="text-editor" />
  757 + </entry>
  758 + <entry file="file://$PROJECT_DIR$/wxParse/htmlparser.js">
  759 + <provider selected="true" editor-type-id="text-editor" />
  760 + </entry>
  761 + <entry file="file://$PROJECT_DIR$/wxParse/showdown.js">
753 <provider selected="true" editor-type-id="text-editor"> 762 <provider selected="true" editor-type-id="text-editor">
754 - <state relative-caret-position="431">  
755 - <caret line="272" column="9" lean-forward="true" selection-start-line="272" selection-start-column="9" selection-end-line="272" selection-end-column="9" /> 763 + <state relative-caret-position="112">
  764 + <caret line="18" column="30" lean-forward="true" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
756 </state> 765 </state>
757 </provider> 766 </provider>
758 </entry> 767 </entry>
759 - <entry file="file://$PROJECT_DIR$/pages/my/my.js"> 768 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxss">
760 <provider selected="true" editor-type-id="text-editor"> 769 <provider selected="true" editor-type-id="text-editor">
761 - <state relative-caret-position="594">  
762 - <caret line="96" column="64" lean-forward="true" selection-start-line="96" selection-start-column="64" selection-end-line="96" selection-end-column="64" /> 770 + <state relative-caret-position="704">
  771 + <caret line="32" column="25" selection-start-line="32" selection-start-column="25" selection-end-line="32" selection-end-column="25" />
763 </state> 772 </state>
764 </provider> 773 </provider>
765 </entry> 774 </entry>
766 - <entry file="file://$PROJECT_DIR$/pages/my/my.wxml"> 775 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxss">
767 <provider selected="true" editor-type-id="text-editor"> 776 <provider selected="true" editor-type-id="text-editor">
768 - <state relative-caret-position="132">  
769 - <caret line="6" column="29" lean-forward="true" selection-start-line="6" selection-start-column="29" selection-end-line="6" selection-end-column="29" /> 777 + <state relative-caret-position="270">
  778 + <caret line="143" column="11" selection-start-line="143" selection-start-column="1" selection-end-line="143" selection-end-column="11" />
770 </state> 779 </state>
771 </provider> 780 </provider>
772 </entry> 781 </entry>
773 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.js"> 782 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.js">
  783 + <provider selected="true" editor-type-id="text-editor" />
  784 + </entry>
  785 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.json">
  786 + <provider selected="true" editor-type-id="text-editor" />
  787 + </entry>
  788 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxml">
774 <provider selected="true" editor-type-id="text-editor"> 789 <provider selected="true" editor-type-id="text-editor">
775 - <state relative-caret-position="632">  
776 - <caret line="158" column="25" lean-forward="true" selection-start-line="158" selection-start-column="25" selection-end-line="158" selection-end-column="25" />  
777 - <folding>  
778 - <element signature="e#152#1691#0" />  
779 - </folding> 790 + <state relative-caret-position="484">
  791 + <caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />
780 </state> 792 </state>
781 </provider> 793 </provider>
782 </entry> 794 </entry>
783 - <entry file="file://$PROJECT_DIR$/pages/my/buyCard/buyCard.js"> 795 + <entry file="file://$PROJECT_DIR$/pages/index/index.js">
784 <provider selected="true" editor-type-id="text-editor"> 796 <provider selected="true" editor-type-id="text-editor">
785 - <state relative-caret-position="432">  
786 - <caret line="105" column="31" lean-forward="true" selection-start-line="105" selection-start-column="31" selection-end-line="105" selection-end-column="31" /> 797 + <state relative-caret-position="421">
  798 + <caret line="187" column="65" lean-forward="true" selection-start-line="187" selection-start-column="65" selection-end-line="187" selection-end-column="65" />
  799 + <folding>
  800 + <element signature="n#!!doc" expanded="true" />
  801 + <element signature="e#3441#6499#0" />
  802 + <element signature="e#6947#8019#0" />
  803 + </folding>
787 </state> 804 </state>
788 </provider> 805 </provider>
789 </entry> 806 </entry>
790 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.json"> 807 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
791 <provider selected="true" editor-type-id="text-editor"> 808 <provider selected="true" editor-type-id="text-editor">
792 - <state relative-caret-position="44">  
793 - <caret line="2" column="1" lean-forward="true" selection-start-line="2" selection-start-column="1" selection-end-line="2" selection-end-column="1" /> 809 + <state relative-caret-position="374">
  810 + <caret line="17" column="16" lean-forward="true" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />
794 </state> 811 </state>
795 </provider> 812 </provider>
796 </entry> 813 </entry>
797 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml"> 814 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
798 <provider selected="true" editor-type-id="text-editor"> 815 <provider selected="true" editor-type-id="text-editor">
799 - <state relative-caret-position="176">  
800 - <caret line="17" column="34" lean-forward="true" selection-start-line="17" selection-start-column="34" selection-end-line="17" selection-end-column="34" /> 816 + <state relative-caret-position="33">
  817 + <caret line="3" column="22" selection-start-line="3" selection-start-column="17" selection-end-line="3" selection-end-column="22" />
801 </state> 818 </state>
802 </provider> 819 </provider>
803 </entry> 820 </entry>
804 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js"> 821 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
805 <provider selected="true" editor-type-id="text-editor"> 822 <provider selected="true" editor-type-id="text-editor">
806 - <state relative-caret-position="638">  
807 - <caret line="29" column="4" lean-forward="true" selection-start-line="29" selection-start-column="4" selection-end-line="29" selection-end-column="4" /> 823 + <state relative-caret-position="66">
  824 + <caret line="3" column="43" selection-start-line="3" selection-start-column="32" selection-end-line="3" selection-end-column="43" />
  825 + <folding>
  826 + <element signature="n#style#0;n#view#0;n#!!top" expanded="true" />
  827 + </folding>
808 </state> 828 </state>
809 </provider> 829 </provider>
810 </entry> 830 </entry>
811 - <entry file="file://$PROJECT_DIR$/templates/templates.wxml"> 831 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxss">
812 <provider selected="true" editor-type-id="text-editor"> 832 <provider selected="true" editor-type-id="text-editor">
813 - <state relative-caret-position="1804">  
814 - <caret line="82" selection-start-line="82" selection-end-line="82" selection-end-column="11" /> 833 + <state relative-caret-position="455">
  834 + <caret line="32" column="14" lean-forward="true" selection-start-line="32" selection-start-column="14" selection-end-line="32" selection-end-column="14" />
815 </state> 835 </state>
816 </provider> 836 </provider>
817 </entry> 837 </entry>
818 - <entry file="file://$PROJECT_DIR$/project.config.json"> 838 + <entry file="file://$PROJECT_DIR$/pages/my/my.wxss">
819 <provider selected="true" editor-type-id="text-editor"> 839 <provider selected="true" editor-type-id="text-editor">
820 - <state relative-caret-position="748">  
821 - <caret line="34" column="26" lean-forward="true" selection-start-line="34" selection-start-column="26" selection-end-line="34" selection-end-column="26" /> 840 + <state relative-caret-position="550">
  841 + <caret line="25" column="14" lean-forward="true" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />
822 </state> 842 </state>
823 </provider> 843 </provider>
824 </entry> 844 </entry>
825 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.wxml">  
826 - <provider selected="true" editor-type-id="text-editor" />  
827 - </entry>  
828 - <entry file="file://$PROJECT_DIR$/pages/start/start.wxml"> 845 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.js">
829 <provider selected="true" editor-type-id="text-editor"> 846 <provider selected="true" editor-type-id="text-editor">
830 - <state relative-caret-position="242">  
831 - <caret line="11" selection-end-line="11" /> 847 + <state relative-caret-position="506">
  848 + <caret line="94" column="10" lean-forward="true" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
  849 + <folding>
  850 + <element signature="e#1652#2617#0" />
  851 + </folding>
832 </state> 852 </state>
833 </provider> 853 </provider>
834 </entry> 854 </entry>
835 - <entry file="file://$PROJECT_DIR$/pages/start/start.js"> 855 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
836 <provider selected="true" editor-type-id="text-editor"> 856 <provider selected="true" editor-type-id="text-editor">
837 - <state relative-caret-position="176">  
838 - <caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="9" selection-end-column="24" /> 857 + <state relative-caret-position="1518">
  858 + <caret line="117" column="41" lean-forward="true" selection-start-line="117" selection-start-column="41" selection-end-line="117" selection-end-column="41" />
  859 + <folding>
  860 + <element signature="e#152#1691#0" />
  861 + </folding>
839 </state> 862 </state>
840 </provider> 863 </provider>
841 </entry> 864 </entry>
842 - <entry file="file://$PROJECT_DIR$/pages/index/phone-code/phone-code.js"> 865 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail/punchAppealDetail.wxml">
843 <provider selected="true" editor-type-id="text-editor"> 866 <provider selected="true" editor-type-id="text-editor">
844 - <state relative-caret-position="616">  
845 - <caret line="88" column="28" selection-start-line="88" selection-start-column="28" selection-end-line="88" selection-end-column="28" /> 867 + <state relative-caret-position="154">
  868 + <caret line="28" column="37" lean-forward="true" selection-start-line="28" selection-start-column="37" selection-end-line="28" selection-end-column="37" />
846 </state> 869 </state>
847 </provider> 870 </provider>
848 </entry> 871 </entry>
849 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxss"> 872 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.wxml">
850 <provider selected="true" editor-type-id="text-editor"> 873 <provider selected="true" editor-type-id="text-editor">
851 - <state relative-caret-position="198">  
852 - <caret line="9" selection-start-line="9" selection-end-line="18" selection-end-column="1" /> 874 + <state relative-caret-position="558">
  875 + <caret line="102" column="57" lean-forward="true" selection-start-line="102" selection-start-column="57" selection-end-line="102" selection-end-column="57" />
853 </state> 876 </state>
854 </provider> 877 </provider>
855 </entry> 878 </entry>
856 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml"> 879 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
857 <provider selected="true" editor-type-id="text-editor"> 880 <provider selected="true" editor-type-id="text-editor">
858 - <state relative-caret-position="66">  
859 - <caret line="3" column="69" selection-start-line="3" selection-start-column="58" selection-end-line="3" selection-end-column="69" /> 881 + <state relative-caret-position="22">
  882 + <caret line="5" column="72" lean-forward="true" selection-start-line="5" selection-start-column="72" selection-end-line="5" selection-end-column="72" />
860 </state> 883 </state>
861 </provider> 884 </provider>
862 </entry> 885 </entry>
863 - <entry file="file://$PROJECT_DIR$/pages/index/index.js"> 886 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.js">
864 <provider selected="true" editor-type-id="text-editor"> 887 <provider selected="true" editor-type-id="text-editor">
865 - <state relative-caret-position="968">  
866 - <caret line="44" selection-start-line="44" selection-end-line="47" selection-end-column="6" />  
867 - <folding>  
868 - <element signature="n#!!doc" expanded="true" />  
869 - <element signature="e#3441#6499#0" />  
870 - <element signature="e#6947#8019#0" />  
871 - </folding> 888 + <state relative-caret-position="462">
  889 + <caret line="120" column="8" lean-forward="true" selection-start-line="120" selection-start-column="8" selection-end-line="130" selection-end-column="28" />
872 </state> 890 </state>
873 </provider> 891 </provider>
874 </entry> 892 </entry>
875 - <entry file="file://$PROJECT_DIR$/app.js"> 893 + <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
876 <provider selected="true" editor-type-id="text-editor"> 894 <provider selected="true" editor-type-id="text-editor">
877 - <state relative-caret-position="264">  
878 - <caret line="55" column="59" selection-start-line="55" selection-start-column="59" selection-end-line="55" selection-end-column="59" /> 895 + <state relative-caret-position="608">
  896 + <caret line="143" selection-start-line="143" selection-end-line="143" />
879 <folding> 897 <folding>
880 - <element signature="e#76#1092#0" />  
881 - <element signature="e#4307#4566#0" />  
882 - <element signature="e#4595#5101#0" />  
883 - <element signature="e#5118#5452#0" />  
884 - <element signature="e#5495#5588#0" />  
885 - <element signature="e#5610#5695#0" /> 898 + <element signature="e#1398#2534#0" />
  899 + <element signature="e#2559#3773#0" />
886 </folding> 900 </folding>
887 </state> 901 </state>
888 </provider> 902 </provider>
@@ -28,8 +28,8 @@ page { @@ -28,8 +28,8 @@ page {
28 position: absolute; 28 position: absolute;
29 left: 0; 29 left: 0;
30 top: 0; 30 top: 0;
31 - background-color: #000000;  
32 - opacity: 0.8; 31 + background-color: transparent;
  32 + /*opacity: 0.8;*/
33 z-index: 10; 33 z-index: 10;
34 } 34 }
35 .circle_large, .circle_middle, .circle_small { 35 .circle_large, .circle_middle, .circle_small {
@@ -14,17 +14,24 @@ Page({ @@ -14,17 +14,24 @@ Page({
14 image1: '', 14 image1: '',
15 image2: '', 15 image2: '',
16 textcontent: '', 16 textcontent: '',
  17 + has_more: true,
  18 + page_number: 1,
  19 + examining:[],
17 }, 20 },
18 //tab切换 21 //tab切换
19 tabCharge(e) { 22 tabCharge(e) {
20 - var index = e.currentTarget.dataset.current 23 + var index = +e.currentTarget.dataset.current
21 var current = this.data.current 24 var current = this.data.current
  25 + console.log('index', index);
22 if (index == current) { 26 if (index == current) {
23 return false 27 return false
24 } else { 28 } else {
25 this.setData({ 29 this.setData({
26 current: index 30 current: index
27 - }) 31 + });
  32 + if(index !== 0) {
  33 + this.getMyComplain(index)
  34 + }
28 } 35 }
29 }, 36 },
30 //申诉内容获取 37 //申诉内容获取
@@ -83,7 +90,7 @@ Page({ @@ -83,7 +90,7 @@ Page({
83 }) 90 })
84 }, 91 },
85 //提交 92 //提交
86 - submit() { 93 + submit(e) {
87 const self = this; 94 const self = this;
88 if(self.data.image === '' && self.data.image1 === '' && self.data.image2 === '') { 95 if(self.data.image === '' && self.data.image1 === '' && self.data.image2 === '') {
89 wx.showToast({title:'请上传申诉照片!',icon: 'none'}) 96 wx.showToast({title:'请上传申诉照片!',icon: 'none'})
@@ -97,6 +104,7 @@ Page({ @@ -97,6 +104,7 @@ Page({
97 let params = { 104 let params = {
98 images: this.data.new_images,//实验室id 105 images: this.data.new_images,//实验室id
99 description: this.data.textcontent, 106 description: this.data.textcontent,
  107 + formId: e.detail.formId,
100 }; 108 };
101 app.post(url, params, header).then((res) => { 109 app.post(url, params, header).then((res) => {
102 console.log('提交结果',res); 110 console.log('提交结果',res);
@@ -114,21 +122,44 @@ Page({ @@ -114,21 +122,44 @@ Page({
114 }) 122 })
115 } 123 }
116 }, 124 },
  125 + //我的申诉
  126 + getMyComplain(current) {
  127 + if(!this.data.has_more) return;
  128 + this.setData({has_more: false});
  129 + let url = '/portal/Experiment/user_complain_list';
  130 + let header = {
  131 + "XX-token": wx.getStorageSync('token')
  132 + };
  133 + let params = {
  134 + status: current,//（1，审核中、2，已通过、3，未通过)
  135 + page: this.data.page_number,
  136 + };
  137 + app.post(url, params, header).then((res) => {
  138 + console.log('我的申诉',res);
  139 + if(res.this_page < res.total_page) {
  140 + this.setData({has_more: true});
  141 + }
  142 + this.setData({examining: this.data.examining.concat(res.list)});
  143 + console.log(this.data.examining);
  144 + })
  145 + },
117 //查看原因跳转申诉详情页 146 //查看原因跳转申诉详情页
118 listDetail(e) { 147 listDetail(e) {
119 const current = +e.currentTarget.dataset.index; 148 const current = +e.currentTarget.dataset.index;
120 - console.log(121);  
121 - wx.navigateTo({  
122 - url: '../punchAppealDetail/punchAppealDetail?status=' + current  
123 - + '&test_name=' + this.data.test_name,  
124 - }) 149 + const id = +e.currentTarget.dataset.id;
  150 + console.log('current',current);
  151 + wx.navigateTo({
  152 + url: '../punchAppealDetail/punchAppealDetail?status=' + current
  153 + + '&test_name=' + this.data.test_name +
  154 + '&id=' + id,
  155 + })
125 }, 156 },
126 /** 157 /**
127 * 生命周期函数--监听页面加载 158 * 生命周期函数--监听页面加载
128 */ 159 */
129 onLoad: function (options) { 160 onLoad: function (options) {
130 console.log('options', options); 161 console.log('options', options);
131 - this.setData({test_name: options.test_name?options.test_name:'',}) 162 + this.setData({test_name: options.test_name?options.test_name:'',});
132 }, 163 },
133 164
134 /** 165 /**
@@ -170,7 +201,17 @@ Page({ @@ -170,7 +201,17 @@ Page({
170 * 页面上拉触底事件的处理函数 201 * 页面上拉触底事件的处理函数
171 */ 202 */
172 onReachBottom: function () { 203 onReachBottom: function () {
173 - 204 + const self = this;
  205 + if(self.data.has_more) {
  206 + self.data.page_number ++;
  207 + self.getMyComplain();
  208 + }else {
  209 + wx.showToast({
  210 + title: '没有更多数据了~',
  211 + icon: 'none'
  212 + });
  213 + }
  214 + console.log('上拉加载');
174 }, 215 },
175 216
176 /** 217 /**
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 <view class="tab_item {{current==3?'tab_active':''}}" data-current='3' bindtap='tabCharge'>未通过</view> 6 <view class="tab_item {{current==3?'tab_active':''}}" data-current='3' bindtap='tabCharge'>未通过</view>
7 </view> 7 </view>
8 <block wx:if='{{current==0}}'> 8 <block wx:if='{{current==0}}'>
9 - <view class='content_box'> 9 + <form bindsubmit="submit" bindreset="formReset" report-submit="true">
  10 + <view class='content_box'>
10 <view class='item_list'> 11 <view class='item_list'>
11 <view class='list_title_info'> 12 <view class='list_title_info'>
12 <view class='iconfont icon-zhongdian'> </view> 13 <view class='iconfont icon-zhongdian'> </view>
@@ -43,20 +44,21 @@ @@ -43,20 +44,21 @@
43 <text>当前：{{test_name || '未获取'}}</text> 44 <text>当前：{{test_name || '未获取'}}</text>
44 </view> 45 </view>
45 <view class='null_box'></view> 46 <view class='null_box'></view>
46 - <view class='submit_btn' bindtap="submit">提 交</view> 47 + <button class='submit_btn' form-type="submit">提 交</button>
47 </view> 48 </view>
48 </view> 49 </view>
  50 + </form>
49 </block> 51 </block>
50 <block wx:elif='{{current==1}}'> 52 <block wx:elif='{{current==1}}'>
51 <view class='review_box'> 53 <view class='review_box'>
52 - <view class='review_item' bindtap='listDetail' data-index="{{1}}">  
53 - <view>提交时间：2018.10.21</view> 54 + <view class='review_item' bindtap='listDetail' data-index="{{index}}" wx:for="{{examining}}" wx:key="index" data-id="{{item.id}}">
  55 + <view>提交时间：{{item.create_time}}</view>
54 <view class='review_content_box'> 56 <view class='review_content_box'>
55 <view class='review_img'> 57 <view class='review_img'>
56 - <image src='../../../images/img1.png'></image> 58 + <image src='{{item.images[0]}}'></image>
57 </view> 59 </view>
58 <view class='review_content'> 60 <view class='review_content'>
59 - <view class='review_info'>卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦</view> 61 + <view class='review_info'>{{item.description}}</view>
60 <view class='review_btn'> 62 <view class='review_btn'>
61 <view class='cancle_btn'>取消申诉</view> 63 <view class='cancle_btn'>取消申诉</view>
62 <view class='review_state'>审核中</view> 64 <view class='review_state'>审核中</view>
@@ -68,14 +70,14 @@ @@ -68,14 +70,14 @@
68 </block> 70 </block>
69 <block wx:elif='{{current==2}}'> 71 <block wx:elif='{{current==2}}'>
70 <view class='review_box'> 72 <view class='review_box'>
71 - <view class='review_item' bindtap='listDetail' data-index="{{2}}">  
72 - <view>提交时间：2018.10.21</view> 73 + <view class='review_item' bindtap='listDetail' data-index="{{index}}" wx:for="{{examining}}" wx:key="index" data-id="{{item.id}}">
  74 + <view>提交时间：{{item.create_time}}</view>
73 <view class='review_content_box'> 75 <view class='review_content_box'>
74 <view class='review_img'> 76 <view class='review_img'>
75 - <image src='../../../images/img1.png'></image> 77 + <image src='{{item.images[0]}}'></image>
76 </view> 78 </view>
77 <view class='review_content'> 79 <view class='review_content'>
78 - <view class='review_info'>卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦</view> 80 + <view class='review_info'>{{item.description}}</view>
79 <view class='review_btn'> 81 <view class='review_btn'>
80 <view class='cancle_btn' style='border:1rpx solid #fff'></view> 82 <view class='cancle_btn' style='border:1rpx solid #fff'></view>
81 <view class='review_state'> 83 <view class='review_state'>
@@ -89,14 +91,14 @@ @@ -89,14 +91,14 @@
89 </block> 91 </block>
90 <block wx:elif='{{current==3}}'> 92 <block wx:elif='{{current==3}}'>
91 <view class='review_box'> 93 <view class='review_box'>
92 - <view class='review_item' bindtap='listDetail' data-index="{{3}}">  
93 - <view>提交时间：2018.10.21</view> 94 + <view class='review_item' bindtap='listDetail' data-index="{{index}}" wx:for="{{examining}}" wx:key="index" data-id="{{item.id}}">
  95 + <view>提交时间：{{item.create_time}}</view>
94 <view class='review_content_box'> 96 <view class='review_content_box'>
95 <view class='review_img'> 97 <view class='review_img'>
96 - <image src='../../../images/img1.png'></image> 98 + <image src='{{item.images[0]}}'></image>
97 </view> 99 </view>
98 <view class='review_content'> 100 <view class='review_content'>
99 - <view class='review_info'>卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦卡上规范咖喱饭咖喱发放啦发货；阿 富汗阿里发布啦 —— 爱因斯坦</view> 101 + <view class='review_info'>{{item.description}}</view>
100 <view class='review_btn'> 102 <view class='review_btn'>
101 <view class='cancle_btn view_btn'>查看原因</view> 103 <view class='cancle_btn view_btn'>查看原因</view>
102 <view class='review_state state3'>未通过</view> 104 <view class='review_state state3'>未通过</view>
@@ -105,4 +107,7 @@ @@ -105,4 +107,7 @@
105 </view> 107 </view>
106 </view> 108 </view>
107 </view> 109 </view>
108 -</block>  
  110 +</block>
  111 +<view class="no-data" wx:if="{{examining.length === 0}}">
  112 + <text>暂无数据</text>
  113 +</view>
@@ -154,6 +154,9 @@ page { @@ -154,6 +154,9 @@ page {
154 bottom: 0; 154 bottom: 0;
155 left: 0; 155 left: 0;
156 } 156 }
  157 +.submit_btn::after {
  158 + border: 0;
  159 +}
157 160
158 .null_box { 161 .null_box {
159 width: 100%; 162 width: 100%;
@@ -241,3 +244,9 @@ page { @@ -241,3 +244,9 @@ page {
241 .icon-dui{ 244 .icon-dui{
242 color: #FC5B63; 245 color: #FC5B63;
243 } 246 }
  247 +.no-data {
  248 + text-align:center;
  249 + font-size:30rpx;
  250 + margin:360rpx 0;
  251 + color:#666666;
  252 +}
@@ -9,15 +9,15 @@ Page({ @@ -9,15 +9,15 @@ Page({
9 status: 1,//1:审核中，2：已通过，3：未通过 9 status: 1,//1:审核中，2：已通过，3：未通过
10 reason: '网络不好', 10 reason: '网络不好',
11 id: 1, 11 id: 1,
12 - image:['http://www.ccfao.gov.cn/zwgk/xxgkml/dtxx/201808/W020180801562481131566.jpg','http://www.ccfao.gov.cn/zwgk/xxgkml/dtxx/201808/W020180801562481131566.jpg'], 12 + image: [],
13 }, 13 },
14 //补充提交申诉 14 //补充提交申诉
15 - againSubmit() { 15 + againSubmit(e) {
16 const self = this; 16 const self = this;
17 console.log(self.data.image.join(',')); 17 console.log(self.data.image.join(','));
18 - if(self.data.image.length === 0) {  
19 - wx.showToast({title:'请上传申诉照片!',icon: 'none'})  
20 - }else { 18 + if (self.data.image.length === 0) {
  19 + wx.showToast({title: '请上传申诉照片!', icon: 'none'})
  20 + } else {
21 let url = '/portal/Experiment/user_complain_second'; 21 let url = '/portal/Experiment/user_complain_second';
22 let header = { 22 let header = {
23 "XX-token": wx.getStorageSync('token') 23 "XX-token": wx.getStorageSync('token')
@@ -26,25 +26,27 @@ Page({ @@ -26,25 +26,27 @@ Page({
26 id: self.data.id,//申诉id 26 id: self.data.id,//申诉id
27 images: self.data.image.join(','), 27 images: self.data.image.join(','),
28 description: this.data.reason, 28 description: this.data.reason,
  29 + formId: e.detail.formId,
29 }; 30 };
30 app.post(url, params, header).then((res) => { 31 app.post(url, params, header).then((res) => {
31 - console.log('提交结果',res);  
32 - // if(res.data.is_success) {  
33 - // wx.showToast({  
34 - // title:'申诉成功',  
35 - // icon: 'success',  
36 - // success:function () {  
37 - // setTimeout(function () {  
38 - // self.setData({current: 1})  
39 - // },500)  
40 - // }  
41 - // })  
42 - // } 32 + console.log('补充提交结果', res);
  33 + if (res.is_success) {
  34 + wx.showToast({
  35 + title: '二次申诉成功',
  36 + icon: 'success',
  37 + success: function () {
  38 + setTimeout(function () {
  39 + wx.navigateBack({
  40 + delta: 1,
  41 + })
  42 + // self.setData({image: '',image1: '',imag2: '',current: 1})
  43 + }, 500)
  44 + }
  45 + })
  46 + }
43 }) 47 })
44 } 48 }
45 - // wx.navigateTo({  
46 - // url: '../punchAppealDetail2/punchAppealDetail2',  
47 - // }) 49 +
48 }, 50 },
49 //上传图片 51 //上传图片
50 uploadImg(e) { 52 uploadImg(e) {
@@ -52,7 +54,7 @@ Page({ @@ -52,7 +54,7 @@ Page({
52 console.log(current); 54 console.log(current);
53 const self = this; 55 const self = this;
54 // self.setData({current:current}) 56 // self.setData({current:current})
55 - if(self.data.status === 3) { 57 + if (self.data.status === 3) {
56 wx.chooseImage({ 58 wx.chooseImage({
57 count: 1, //最多可以选择的图片总数 59 count: 1, //最多可以选择的图片总数
58 sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有 60 sizeType: ['compressed'], // 可以指定是原图还是压缩图，默认二者都有
@@ -60,7 +62,7 @@ Page({ @@ -60,7 +62,7 @@ Page({
60 success: function (res) { 62 success: function (res) {
61 console.log(res.tempFilePaths[0]); 63 console.log(res.tempFilePaths[0]);
62 const tempFilePaths = res.tempFilePaths[0]; 64 const tempFilePaths = res.tempFilePaths[0];
63 - self.setData({[`image[${current}]`]:tempFilePaths}); 65 + self.setData({[`image[${current}]`]: tempFilePaths});
64 // if() { 66 // if() {
65 // 67 //
66 // } 68 // }
@@ -76,16 +78,20 @@ Page({ @@ -76,16 +78,20 @@ Page({
76 }, 78 },
77 //获取申诉详情 79 //获取申诉详情
78 getAppealInfo() { 80 getAppealInfo() {
79 - let url = '/portal/Experiment/user_complain'; 81 + let url = '/portal/Experiment/user_complain_detail';
80 let header = { 82 let header = {
81 "XX-token": wx.getStorageSync('token') 83 "XX-token": wx.getStorageSync('token')
82 }; 84 };
83 let params = { 85 let params = {
84 - // images: this.data.new_images,//实验室id  
85 - // description: this.data.textcontent, 86 + id: this.data.id,//申诉id
86 }; 87 };
87 app.post(url, params, header).then((res) => { 88 app.post(url, params, header).then((res) => {
88 - console.log('申诉详情',res); 89 + console.log('申诉详情', res);
  90 + if (res.info.status === 4 || res.info.status === 5 || res.info.status === 6) {
  91 + this.setData({detail: res.info, image: res.info.re_images})
  92 + } else {
  93 + this.setData({detail: res.info, image: res.info.images})
  94 + }
89 }) 95 })
90 }, 96 },
91 /** 97 /**
@@ -93,12 +99,13 @@ Page({ @@ -93,12 +99,13 @@ Page({
93 */ 99 */
94 onLoad: function (options) { 100 onLoad: function (options) {
95 const self = this; 101 const self = this;
96 - self.getAppealInfo();  
97 console.log('options', options); 102 console.log('options', options);
98 self.setData({ 103 self.setData({
99 - status: +options.status?+options.status:'',  
100 - test_name: options.test_name?options.test_name:'',  
101 - }) 104 + status: +options.status ? +options.status : '',
  105 + test_name: options.test_name ? options.test_name : '',
  106 + id: +options.id ? +options.id : '',
  107 + });
  108 + self.getAppealInfo();
102 }, 109 },
103 110
104 /** 111 /**
1 <!--pages/punchAppealDetail/punchAppealDetail.wxml--> 1 <!--pages/punchAppealDetail/punchAppealDetail.wxml-->
2 -<view class='content_box'>  
3 - <view class='item_list'>  
4 - <view class='uoload_box' wx:if="{{image.length > 0}}">  
5 - <view class='upload_item' bindtap='uploadImg' data-current="0">  
6 - <text class='iconfont icon-jia' wx:if="{{image[0] === undefined}}"></text>  
7 - <image src="{{image[0]}}" mode="aspectFill" wx:else></image>  
8 - </view>  
9 - <view class='upload_item' bindtap='uploadImg' data-current="1">  
10 - <text class='iconfont icon-jia' wx:if="{{image[1] === undefined}}"></text>  
11 - <image src="{{image[1]}}" mode="aspectFill" wx:else></image>  
12 - </view>  
13 - <view class='upload_item' bindtap='uploadImg' data-current="2">  
14 - <text class='iconfont icon-jia' wx:if="{{image[2] === undefined}}"></text>  
15 - <image src="{{image[2]}}" mode="aspectFill" wx:else></image>  
16 - </view> 2 +<form bindsubmit="againSubmit" bindreset="formReset" report-submit="true">
  3 + <view class='content_box'>
  4 + <view class='item_list'>
  5 + <view class='uoload_box' wx:if="{{image.length > 0}}">
  6 + <view class='upload_item' bindtap='uploadImg' data-current="0">
  7 + <text class='iconfont icon-jia' wx:if="{{image[0] === undefined}}"></text>
  8 + <image src="{{image[0]}}" mode="aspectFill" wx:else></image>
  9 + </view>
  10 + <view class='upload_item' bindtap='uploadImg' data-current="1">
  11 + <text class='iconfont icon-jia' wx:if="{{image[1] === undefined}}"></text>
  12 + <image src="{{image[1]}}" mode="aspectFill" wx:else></image>
  13 + </view>
  14 + <view class='upload_item' bindtap='uploadImg' data-current="2">
  15 + <text class='iconfont icon-jia' wx:if="{{image[2] === undefined}}"></text>
  16 + <image src="{{image[2]}}" mode="aspectFill" wx:else></image>
  17 + </view>
  18 + </view>
  19 + </view>
  20 + <view class='item_list' wx:if="{{detail.status !== 4 && detail.status !== 5 && detail.status !== 6 }}">
  21 + <view class='list_title'>申诉理由</view>
  22 + <view class='list_input'>
  23 + <view>{{detail.description}}</view>
  24 + <view class='word_num'>{{detail.create_time}}</view>
  25 + </view>
  26 + </view>
  27 + <view class='item_list' wx:if="{{detail.status === 4 || detail.status === 5 || detail.status === 6 }}">
  28 + <view class='list_title'>申诉理由</view>
  29 + <view class='list_input'>
  30 + <view>{{detail.re_description}}</view>
  31 + <view class='word_num'>{{detail.create_time}}</view>
  32 + </view>
  33 + </view>
  34 + <view class='item_list' wx:if="{{detail.status === 3}}">
  35 + <view class='list_title'>未通过原因</view>
  36 + <view class='list_input'>
  37 + <view>{{detail.reason}}</view>
  38 + <view class='word_num'>{{detail.handle_time}}</view>
  39 + </view>
  40 + </view>
  41 + <view class='item_list' wx:if="{{detail.status === 6}}">
  42 + <view class='list_title'>未通过原因</view>
  43 + <view class='list_input'>
  44 + <view>{{detail.re_reason}}</view>
  45 + <view class='word_num'>{{detail.handle_time}}</view>
  46 + </view>
  47 + </view>
  48 + <view wx:if="{{detail.status !== 3 && detail.status !== 6}}" class="current-test">
  49 + <text class="circle"></text>
  50 + <text>当前：{{test_name || '未获取'}}</text>
  51 + </view>
  52 + <view class='null_box' wx:if="{{detail.status === 3}}"></view>
  53 + <button class='submit_btn' form-type='submit' wx:if="{{detail.status === 3}}">补充提交</button>
17 </view> 54 </view>
18 - </view>  
19 - <view class='item_list'>  
20 - <view class='list_title'>申诉理由</view>  
21 - <view class='list_input'>  
22 - <view>{{reason}}</view>  
23 - <view class='word_num'>2018.10.10</view>  
24 - </view>  
25 - </view>  
26 - <view class='item_list' wx:if="{{status === 3}}">  
27 - <view class='list_title'>未通过原因</view>  
28 - <view class='list_input'>  
29 - <view>朝阳区万寿路5号楼马兰大厦B座301念读书馆内朝阳区万寿路5号楼马兰大厦B座301念读书馆内朝阳</view>  
30 - <view class='word_num'>2018.10.10</view>  
31 - </view>  
32 - </view>  
33 - <view wx:if="{{status !== 3}}" class="current-test">  
34 - <text class="circle"></text>  
35 - <text>当前：{{test_name || '未获取'}}</text>  
36 - </view>  
37 - <view class='null_box' wx:if="{{status === 3}}"></view>  
38 - <view class='submit_btn' bindtap='againSubmit' wx:if="{{status === 3}}">补充提交</view>  
39 -</view> 55 +</form>
40 56
@@ -37,9 +37,9 @@ Page({ @@ -37,9 +37,9 @@ Page({
37 }) 37 })
38 }, 38 },
39 swiperChange: function (e) { //切换轮播图 39 swiperChange: function (e) { //切换轮播图
40 - console.log(e, e.detail.current, this.data.currentSwiper, this.data.cur) 40 + // console.log(e, e.detail.current, this.data.currentSwiper, this.data.cur)
41 this.setData({ 41 this.setData({
42 - // currentSwiper: e.detail.current, 42 + currentSwiper: e.detail.current,
43 }) 43 })
44 }, 44 },
45 //首次登录小程序，跳转到认证手机页面 45 //首次登录小程序，跳转到认证手机页面
@@ -13,8 +13,8 @@ page { @@ -13,8 +13,8 @@ page {
13 position: absolute; 13 position: absolute;
14 left: 0; 14 left: 0;
15 top: 0; 15 top: 0;
16 - background-color: #000000;  
17 - opacity: 0.8; 16 + background-color: transparent;
  17 + /*opacity: 0.8;*/
18 z-index: 10; 18 z-index: 10;
19 } 19 }
20 20
@@ -21,8 +21,8 @@ @@ -21,8 +21,8 @@
21 position: absolute; 21 position: absolute;
22 left: 0; 22 left: 0;
23 top: 0; 23 top: 0;
24 - background-color: #000000;  
25 - opacity: 0.8; 24 + background-color: transparent;
  25 + /*opacity: 0.8;*/
26 z-index: 10; 26 z-index: 10;
27 } 27 }
28 .icon-bianji2{ 28 .icon-bianji2{
@@ -116,7 +116,7 @@ function html2json(html, bindName) { @@ -116,7 +116,7 @@ function html2json(html, bindName) {
116 // has multi attibutes 116 // has multi attibutes
117 // make it array of attribute 117 // make it array of attribute
118 if (name == 'style') { 118 if (name == 'style') {
119 - console.dir(value); 119 + // console.dir(value);
120 // value = value.join("") 120 // value = value.join("")
121 node.styleStr = value; 121 node.styleStr = value;
122 } 122 }