miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘朕
提交 bde6d140502e022fd24091c24021b12e0cbaf851 2 个父辈 b693328e 2c731335

Merge branch 'wumengyu' of http://114.215.101.231:8099/miniprogram/ScienceCaptain into wumengyu 

# Conflicts:
#	pages/clock/clock.js
内嵌 并排对比
正在显示 5 个修改的文件 包含 149 行增加 和 131 行删除
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$/pages/index/go-appointment/go-appointment.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/pages/clock/clock.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/clock/clock.js" afterDir="false" />
  7 + <change beforePath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss" afterDir="false" />
  8 + <change beforePath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/my/order-detail/order-detail.js" afterDir="false" />
7 </list> 9 </list>
8 <ignored path="$PROJECT_DIR$/.tmp/" /> 10 <ignored path="$PROJECT_DIR$/.tmp/" />
9 <ignored path="$PROJECT_DIR$/temp/" /> 11 <ignored path="$PROJECT_DIR$/temp/" />
@@ -18,39 +20,39 @@ @@ -18,39 +20,39 @@
18 <session id="-381596063"> 20 <session id="-381596063">
19 <usages-collector id="statistics.lifecycle.project"> 21 <usages-collector id="statistics.lifecycle.project">
20 <counts> 22 <counts>
21 - <entry key="project.closed" value="26" />  
22 - <entry key="project.open.time.0" value="6" /> 23 + <entry key="project.closed" value="31" />
  24 + <entry key="project.open.time.0" value="7" />
23 <entry key="project.open.time.1" value="11" /> 25 <entry key="project.open.time.1" value="11" />
24 - <entry key="project.open.time.10" value="1" /> 26 + <entry key="project.open.time.10" value="2" />
25 <entry key="project.open.time.13" value="1" /> 27 <entry key="project.open.time.13" value="1" />
26 <entry key="project.open.time.14" value="1" /> 28 <entry key="project.open.time.14" value="1" />
27 <entry key="project.open.time.2" value="3" /> 29 <entry key="project.open.time.2" value="3" />
28 - <entry key="project.open.time.8" value="3" /> 30 + <entry key="project.open.time.8" value="5" />
29 <entry key="project.open.time.9" value="3" /> 31 <entry key="project.open.time.9" value="3" />
30 - <entry key="project.opened" value="29" /> 32 + <entry key="project.opened" value="33" />
31 </counts> 33 </counts>
32 </usages-collector> 34 </usages-collector>
33 <usages-collector id="statistics.file.extensions.open"> 35 <usages-collector id="statistics.file.extensions.open">
34 <counts> 36 <counts>
35 - <entry key="js" value="177" />  
36 - <entry key="json" value="32" />  
37 - <entry key="wxml" value="143" />  
38 - <entry key="wxss" value="55" /> 37 + <entry key="js" value="179" />
  38 + <entry key="json" value="33" />
  39 + <entry key="wxml" value="145" />
  40 + <entry key="wxss" value="57" />
39 </counts> 41 </counts>
40 </usages-collector> 42 </usages-collector>
41 <usages-collector id="statistics.file.types.open"> 43 <usages-collector id="statistics.file.types.open">
42 <counts> 44 <counts>
43 - <entry key="CSS" value="55" />  
44 - <entry key="HTML" value="143" />  
45 - <entry key="JSON" value="32" />  
46 - <entry key="JavaScript" value="177" /> 45 + <entry key="CSS" value="57" />
  46 + <entry key="HTML" value="145" />
  47 + <entry key="JSON" value="33" />
  48 + <entry key="JavaScript" value="179" />
47 </counts> 49 </counts>
48 </usages-collector> 50 </usages-collector>
49 <usages-collector id="statistics.file.extensions.edit"> 51 <usages-collector id="statistics.file.extensions.edit">
50 <counts> 52 <counts>
51 <entry key="js" value="15528" /> 53 <entry key="js" value="15528" />
52 <entry key="json" value="158" /> 54 <entry key="json" value="158" />
53 - <entry key="txt" value="502" /> 55 + <entry key="txt" value="508" />
54 <entry key="wxml" value="3781" /> 56 <entry key="wxml" value="3781" />
55 <entry key="wxss" value="1627" /> 57 <entry key="wxss" value="1627" />
56 </counts> 58 </counts>
@@ -61,7 +63,7 @@ @@ -61,7 +63,7 @@
61 <entry key="HTML" value="3781" /> 63 <entry key="HTML" value="3781" />
62 <entry key="JSON" value="158" /> 64 <entry key="JSON" value="158" />
63 <entry key="JavaScript" value="15528" /> 65 <entry key="JavaScript" value="15528" />
64 - <entry key="PLAIN_TEXT" value="502" /> 66 + <entry key="PLAIN_TEXT" value="508" />
65 </counts> 67 </counts>
66 </usages-collector> 68 </usages-collector>
67 <usages-collector id="statistics.vcs.git.usages"> 69 <usages-collector id="statistics.vcs.git.usages">
@@ -73,73 +75,66 @@ @@ -73,73 +75,66 @@
73 </component> 75 </component>
74 <component name="FileEditorManager"> 76 <component name="FileEditorManager">
75 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 77 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
76 - <file pinned="false" current-in-tab="true">  
77 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js"> 78 + <file pinned="false" current-in-tab="false">
  79 + <entry file="file://$PROJECT_DIR$/app.json">
78 <provider selected="true" editor-type-id="text-editor"> 80 <provider selected="true" editor-type-id="text-editor">
79 - <state relative-caret-position="154">  
80 - <caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" /> 81 + <state relative-caret-position="396">
  82 + <caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
81 </state> 83 </state>
82 </provider> 84 </provider>
83 </entry> 85 </entry>
84 </file> 86 </file>
85 - <file pinned="false" current-in-tab="false">  
86 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml"> 87 + <file pinned="false" current-in-tab="true">
  88 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
87 <provider selected="true" editor-type-id="text-editor"> 89 <provider selected="true" editor-type-id="text-editor">
88 - <state relative-caret-position="176">  
89 - <caret line="23" column="75" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="75" /> 90 + <state relative-caret-position="356">
  91 + <caret line="121" column="42" selection-start-line="121" selection-start-column="42" selection-end-line="121" selection-end-column="42" />
90 </state> 92 </state>
91 </provider> 93 </provider>
92 </entry> 94 </entry>
93 </file> 95 </file>
94 <file pinned="false" current-in-tab="false"> 96 <file pinned="false" current-in-tab="false">
95 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json"> 97 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
96 <provider selected="true" editor-type-id="text-editor" /> 98 <provider selected="true" editor-type-id="text-editor" />
97 </entry> 99 </entry>
98 </file> 100 </file>
99 <file pinned="false" current-in-tab="false"> 101 <file pinned="false" current-in-tab="false">
100 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.js"> 102 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
101 <provider selected="true" editor-type-id="text-editor"> 103 <provider selected="true" editor-type-id="text-editor">
102 - <state relative-caret-position="3586">  
103 - <caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" /> 104 + <state relative-caret-position="946">
  105 + <caret line="43" column="32" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="32" />
104 </state> 106 </state>
105 </provider> 107 </provider>
106 </entry> 108 </entry>
107 </file> 109 </file>
108 <file pinned="false" current-in-tab="false"> 110 <file pinned="false" current-in-tab="false">
109 - <entry file="file://$PROJECT_DIR$/pages/start/start.js"> 111 + <entry file="file://$PROJECT_DIR$/templates/templates.wxss">
110 <provider selected="true" editor-type-id="text-editor"> 112 <provider selected="true" editor-type-id="text-editor">
111 - <state relative-caret-position="499">  
112 - <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" /> 113 + <state relative-caret-position="3982">
  114 + <caret line="181" column="1" selection-start-line="145" selection-end-line="181" selection-end-column="1" />
113 </state> 115 </state>
114 </provider> 116 </provider>
115 </entry> 117 </entry>
116 </file> 118 </file>
117 <file pinned="false" current-in-tab="false"> 119 <file pinned="false" current-in-tab="false">
118 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js"> 120 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
119 <provider selected="true" editor-type-id="text-editor"> 121 <provider selected="true" editor-type-id="text-editor">
120 - <state relative-caret-position="1056">  
121 - <caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" /> 122 + <state relative-caret-position="506">
  123 + <caret line="23" column="75" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="75" />
122 </state> 124 </state>
123 </provider> 125 </provider>
124 </entry> 126 </entry>
125 </file> 127 </file>
126 <file pinned="false" current-in-tab="false"> 128 <file pinned="false" current-in-tab="false">
127 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">  
128 - <provider selected="true" editor-type-id="text-editor">  
129 - <state relative-caret-position="1320">  
130 - <caret line="60" column="40" lean-forward="true" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="40" />  
131 - </state>  
132 - </provider> 129 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json">
  130 + <provider selected="true" editor-type-id="text-editor" />
133 </entry> 131 </entry>
134 </file> 132 </file>
135 <file pinned="false" current-in-tab="false"> 133 <file pinned="false" current-in-tab="false">
136 - <entry file="file://$PROJECT_DIR$/pages/index/index.js"> 134 + <entry file="file://$PROJECT_DIR$/pages/start/start.js">
137 <provider selected="true" editor-type-id="text-editor"> 135 <provider selected="true" editor-type-id="text-editor">
138 - <state relative-caret-position="1452">  
139 - <caret line="67" column="23" lean-forward="true" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" />  
140 - <folding>  
141 - <element signature="n#!!doc" expanded="true" />  
142 - </folding> 136 + <state relative-caret-position="924">
  137 + <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
143 </state> 138 </state>
144 </provider> 139 </provider>
145 </entry> 140 </entry>
@@ -166,20 +161,10 @@ @@ -166,20 +161,10 @@
166 </component> 161 </component>
167 <component name="FindInProjectRecents"> 162 <component name="FindInProjectRecents">
168 <findStrings> 163 <findStrings>
169 - <find>id</find>  
170 - <find>打卡</find>  
171 - <find>test</find>  
172 - <find>postPosition</find>  
173 - <find>getExperiment</find>  
174 - <find>recordList</find>  
175 - <find>page_number</find>  
176 - <find>delStudent</find>  
177 - <find>swiper</find>  
178 <find>兑换</find> 164 <find>兑换</find>
179 <find>mode=&quot;date&quot;</find> 165 <find>mode=&quot;date&quot;</find>
180 <find>birth_date</find> 166 <find>birth_date</find>
181 <find>default_birth</find> 167 <find>default_birth</find>
182 - <find>删除</find>  
183 <find>wxparse</find> 168 <find>wxparse</find>
184 <find>copy</find> 169 <find>copy</find>
185 <find>chargenum</find> 170 <find>chargenum</find>
@@ -196,9 +181,20 @@ @@ -196,9 +181,20 @@
196 <find>is_choose_test</find> 181 <find>is_choose_test</find>
197 <find>app/public/getSessionKey</find> 182 <find>app/public/getSessionKey</find>
198 <find>login</find> 183 <find>login</find>
  184 + <find>chooseTest</find>
  185 + <find>background</find>
  186 + <find>disableScroll</find>
  187 + <find>maxlength</find>
  188 + <find>modal</find>
  189 + <find>删除</find>
  190 + <find>modal_data</find>
  191 + <find>state-modal</find>
  192 + <find>modal_box</find>
  193 + <find>getExperiment</find>
199 </findStrings> 194 </findStrings>
200 <dirStrings> 195 <dirStrings>
201 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir> 196 <dir>D:\小程序\scienceCaptain\ScienceCaptain\pages\index\confirm-appointment-info</dir>
  197 + <dir>D:\小程序\scienceCaptain\ScienceCaptain</dir>
202 </dirStrings> 198 </dirStrings>
203 </component> 199 </component>
204 <component name="Git.Settings"> 200 <component name="Git.Settings">
@@ -281,10 +277,10 @@ @@ -281,10 +277,10 @@
281 <sorting>DEFINITION_ORDER</sorting> 277 <sorting>DEFINITION_ORDER</sorting>
282 </component> 278 </component>
283 <component name="ProjectFrameBounds" extendedState="6"> 279 <component name="ProjectFrameBounds" extendedState="6">
284 - <option name="x" value="576" />  
285 - <option name="y" value="1" /> 280 + <option name="x" value="-129" />
  281 + <option name="y" value="109" />
286 <option name="width" value="1936" /> 282 <option name="width" value="1936" />
287 - <option name="height" value="1056" /> 283 + <option name="height" value="929" />
288 </component> 284 </component>
289 <component name="ProjectView"> 285 <component name="ProjectView">
290 <navigator proportions="" version="1"> 286 <navigator proportions="" version="1">
@@ -409,6 +405,11 @@ @@ -409,6 +405,11 @@
409 <path> 405 <path>
410 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" /> 406 <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
411 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 407 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  408 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  409 + </path>
  410 + <path>
  411 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  412 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
412 <item name="utils" type="462c0819:PsiDirectoryNode" /> 413 <item name="utils" type="462c0819:PsiDirectoryNode" />
413 </path> 414 </path>
414 </expand> 415 </expand>
@@ -482,7 +483,11 @@ @@ -482,7 +483,11 @@
482 <workItem from="1545726292000" duration="5146000" /> 483 <workItem from="1545726292000" duration="5146000" />
483 <workItem from="1550217990354" duration="2213000" /> 484 <workItem from="1550217990354" duration="2213000" />
484 <workItem from="1550537830511" duration="1208000" /> 485 <workItem from="1550537830511" duration="1208000" />
485 - <workItem from="1550623390588" duration="858000" /> 486 + <workItem from="1550623390588" duration="5445000" />
  487 + <workItem from="1550709960596" duration="2176000" />
  488 + <workItem from="1550796004174" duration="244000" />
  489 + <workItem from="1550905359680" duration="1308000" />
  490 + <workItem from="1551141819511" duration="118000" />
486 </task> 491 </task>
487 <task id="LOCAL-00001" summary="modal 模板"> 492 <task id="LOCAL-00001" summary="modal 模板">
488 <created>1542274356914</created> 493 <created>1542274356914</created>
@@ -596,11 +601,18 @@ @@ -596,11 +601,18 @@
596 <option name="project" value="LOCAL" /> 601 <option name="project" value="LOCAL" />
597 <updated>1550218989460</updated> 602 <updated>1550218989460</updated>
598 </task> 603 </task>
599 - <option name="localTasksCounter" value="17" /> 604 + <task id="LOCAL-00017" summary="优化选择场次">
  605 + <created>1550624335404</created>
  606 + <option name="number" value="00017" />
  607 + <option name="presentableId" value="LOCAL-00017" />
  608 + <option name="project" value="LOCAL" />
  609 + <updated>1550624335404</updated>
  610 + </task>
  611 + <option name="localTasksCounter" value="18" />
600 <servers /> 612 <servers />
601 </component> 613 </component>
602 <component name="TimeTrackingManager"> 614 <component name="TimeTrackingManager">
603 - <option name="totallyTimeSpent" value="270418000" /> 615 + <option name="totallyTimeSpent" value="278851000" />
604 </component> 616 </component>
605 <component name="ToolWindowManager"> 617 <component name="ToolWindowManager">
606 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 618 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -674,33 +686,10 @@ @@ -674,33 +686,10 @@
674 <MESSAGE value="去掉测试数据" /> 686 <MESSAGE value="去掉测试数据" />
675 <MESSAGE value="优化预约" /> 687 <MESSAGE value="优化预约" />
676 <MESSAGE value="优化登录出现参数错误问题" /> 688 <MESSAGE value="优化登录出现参数错误问题" />
677 - <option name="LAST_COMMIT_MESSAGE" value="优化登录出现参数错误问题" /> 689 + <MESSAGE value="优化选择场次" />
  690 + <option name="LAST_COMMIT_MESSAGE" value="优化选择场次" />
678 </component> 691 </component>
679 <component name="editorHistoryManager"> 692 <component name="editorHistoryManager">
680 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.json">  
681 - <provider selected="true" editor-type-id="text-editor" />  
682 - </entry>  
683 - <entry file="file://$PROJECT_DIR$/pages/clock/punchAppealDetail2/punchAppealDetail2.wxml">  
684 - <provider selected="true" editor-type-id="text-editor">  
685 - <state relative-caret-position="484">  
686 - <caret line="22" column="30" lean-forward="true" selection-start-line="22" selection-start-column="30" selection-end-line="22" selection-end-column="30" />  
687 - </state>  
688 - </provider>  
689 - </entry>  
690 - <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">  
691 - <provider selected="true" editor-type-id="text-editor">  
692 - <state relative-caret-position="374">  
693 - <caret line="17" column="16" lean-forward="true" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="16" />  
694 - </state>  
695 - </provider>  
696 - </entry>  
697 - <entry file="file://$PROJECT_DIR$/pages/my/my.wxss">  
698 - <provider selected="true" editor-type-id="text-editor">  
699 - <state relative-caret-position="550">  
700 - <caret line="25" column="14" selection-start-line="25" selection-start-column="14" selection-end-line="25" selection-end-column="14" />  
701 - </state>  
702 - </provider>  
703 - </entry>  
704 <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml"> 693 <entry file="file://$PROJECT_DIR$/pages/clock/clock.wxml">
705 <provider selected="true" editor-type-id="text-editor"> 694 <provider selected="true" editor-type-id="text-editor">
706 <state relative-caret-position="374"> 695 <state relative-caret-position="374">
@@ -827,20 +816,6 @@ @@ -827,20 +816,6 @@
827 </state> 816 </state>
828 </provider> 817 </provider>
829 </entry> 818 </entry>
830 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">  
831 - <provider selected="true" editor-type-id="text-editor">  
832 - <state relative-caret-position="792">  
833 - <caret line="36" column="50" selection-start-line="36" selection-start-column="40" selection-end-line="36" selection-end-column="50" />  
834 - </state>  
835 - </provider>  
836 - </entry>  
837 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">  
838 - <provider selected="true" editor-type-id="text-editor">  
839 - <state relative-caret-position="3564">  
840 - <caret line="162" column="79" selection-start-line="162" selection-start-column="40" selection-end-line="162" selection-end-column="79" />  
841 - </state>  
842 - </provider>  
843 - </entry>  
844 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml"> 819 <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxml">
845 <provider selected="true" editor-type-id="text-editor"> 820 <provider selected="true" editor-type-id="text-editor">
846 <state relative-caret-position="418"> 821 <state relative-caret-position="418">
@@ -956,13 +931,6 @@ @@ -956,13 +931,6 @@
956 </state> 931 </state>
957 </provider> 932 </provider>
958 </entry> 933 </entry>
959 - <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">  
960 - <provider selected="true" editor-type-id="text-editor">  
961 - <state relative-caret-position="3586">  
962 - <caret line="163" column="19" selection-start-line="163" selection-start-column="19" selection-end-line="163" selection-end-column="19" />  
963 - </state>  
964 - </provider>  
965 - </entry>  
966 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js"> 934 <entry file="file://$PROJECT_DIR$/pages/clock/punchAppeal/punchAppeal.js">
967 <provider selected="true" editor-type-id="text-editor"> 935 <provider selected="true" editor-type-id="text-editor">
968 <state relative-caret-position="1056"> 936 <state relative-caret-position="1056">
@@ -981,36 +949,54 @@ @@ -981,36 +949,54 @@
981 <provider selected="true" editor-type-id="text-editor"> 949 <provider selected="true" editor-type-id="text-editor">
982 <state relative-caret-position="1452"> 950 <state relative-caret-position="1452">
983 <caret line="67" column="23" lean-forward="true" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" /> 951 <caret line="67" column="23" lean-forward="true" selection-start-line="67" selection-start-column="23" selection-end-line="67" selection-end-column="23" />
984 - <folding>  
985 - <element signature="n#!!doc" expanded="true" />  
986 - </folding>  
987 </state> 952 </state>
988 </provider> 953 </provider>
989 </entry> 954 </entry>
990 - <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml"> 955 + <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js">
991 <provider selected="true" editor-type-id="text-editor"> 956 <provider selected="true" editor-type-id="text-editor">
992 - <state relative-caret-position="242">  
993 - <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" /> 957 + <state relative-caret-position="418">
  958 + <caret line="19" column="25" selection-start-line="19" selection-start-column="25" selection-end-line="19" selection-end-column="25" />
994 </state> 959 </state>
995 </provider> 960 </provider>
996 </entry> 961 </entry>
997 - <entry file="file://$PROJECT_DIR$/app.js"> 962 + <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
998 <provider selected="true" editor-type-id="text-editor"> 963 <provider selected="true" editor-type-id="text-editor">
999 - <state relative-caret-position="3454">  
1000 - <caret line="158" column="2" lean-forward="true" selection-start-line="158" selection-start-column="2" selection-end-line="158" selection-end-column="2" /> 964 + <state relative-caret-position="1276">
  965 + <caret line="58" column="44" selection-start-line="58" selection-start-column="35" selection-end-line="58" selection-end-column="44" />
1001 </state> 966 </state>
1002 </provider> 967 </provider>
1003 </entry> 968 </entry>
1004 - <entry file="file://$PROJECT_DIR$/pages/start/start.js"> 969 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.js">
1005 <provider selected="true" editor-type-id="text-editor"> 970 <provider selected="true" editor-type-id="text-editor">
1006 - <state relative-caret-position="499">  
1007 - <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" /> 971 + <state relative-caret-position="1430">
  972 + <caret line="65" column="23" selection-start-line="65" selection-start-column="23" selection-end-line="65" selection-end-column="23" />
  973 + </state>
  974 + </provider>
  975 + </entry>
  976 + <entry file="file://$PROJECT_DIR$/app.json">
  977 + <provider selected="true" editor-type-id="text-editor">
  978 + <state relative-caret-position="396">
  979 + <caret line="18" column="47" lean-forward="true" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
  980 + </state>
  981 + </provider>
  982 + </entry>
  983 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
  984 + <provider selected="true" editor-type-id="text-editor">
  985 + <state relative-caret-position="946">
  986 + <caret line="43" column="32" selection-start-line="43" selection-start-column="32" selection-end-line="43" selection-end-column="32" />
  987 + </state>
  988 + </provider>
  989 + </entry>
  990 + <entry file="file://$PROJECT_DIR$/templates/templates.wxss">
  991 + <provider selected="true" editor-type-id="text-editor">
  992 + <state relative-caret-position="3982">
  993 + <caret line="181" column="1" selection-start-line="145" selection-end-line="181" selection-end-column="1" />
1008 </state> 994 </state>
1009 </provider> 995 </provider>
1010 </entry> 996 </entry>
1011 <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml"> 997 <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.wxml">
1012 <provider selected="true" editor-type-id="text-editor"> 998 <provider selected="true" editor-type-id="text-editor">
1013 - <state relative-caret-position="176"> 999 + <state relative-caret-position="506">
1014 <caret line="23" column="75" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="75" /> 1000 <caret line="23" column="75" selection-start-line="23" selection-start-column="65" selection-end-line="23" selection-end-column="75" />
1015 </state> 1001 </state>
1016 </provider> 1002 </provider>
@@ -1018,10 +1004,34 @@ @@ -1018,10 +1004,34 @@
1018 <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json"> 1004 <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.json">
1019 <provider selected="true" editor-type-id="text-editor" /> 1005 <provider selected="true" editor-type-id="text-editor" />
1020 </entry> 1006 </entry>
1021 - <entry file="file://$PROJECT_DIR$/pages/index/go-appointment/go-appointment.js"> 1007 + <entry file="file://$PROJECT_DIR$/pages/start/start.js">
  1008 + <provider selected="true" editor-type-id="text-editor">
  1009 + <state relative-caret-position="924">
  1010 + <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
  1011 + </state>
  1012 + </provider>
  1013 + </entry>
  1014 + <entry file="file://$PROJECT_DIR$/pages/my/appointmentRecord/appointmentRecord.wxml">
  1015 + <provider selected="true" editor-type-id="text-editor">
  1016 + <state relative-caret-position="242">
  1017 + <caret line="11" column="19" selection-start-line="11" selection-start-column="19" selection-end-line="11" selection-end-column="19" />
  1018 + </state>
  1019 + </provider>
  1020 + </entry>
  1021 + <entry file="file://$PROJECT_DIR$/app.js">
  1022 + <provider selected="true" editor-type-id="text-editor">
  1023 + <state relative-caret-position="3454">
  1024 + <caret line="158" column="2" lean-forward="true" selection-start-line="158" selection-start-column="2" selection-end-line="158" selection-end-column="2" />
  1025 + </state>
  1026 + </provider>
  1027 + </entry>
  1028 + <entry file="file://$PROJECT_DIR$/pages/index/activity-detail/activity-detail.wxss">
  1029 + <provider selected="true" editor-type-id="text-editor" />
  1030 + </entry>
  1031 + <entry file="file://$PROJECT_DIR$/pages/clock/clock.js">
1022 <provider selected="true" editor-type-id="text-editor"> 1032 <provider selected="true" editor-type-id="text-editor">
1023 - <state relative-caret-position="154">  
1024 - <caret line="40" column="25" selection-start-line="40" selection-start-column="25" selection-end-line="40" selection-end-column="25" /> 1033 + <state relative-caret-position="356">
  1034 + <caret line="121" column="42" selection-start-line="121" selection-start-column="42" selection-end-line="121" selection-end-column="42" />
1025 </state> 1035 </state>
1026 </provider> 1036 </provider>
1027 </entry> 1037 </entry>
@@ -115,9 +115,8 @@ Page({ @@ -115,9 +115,8 @@ Page({
115 lng: this.data.longitude, 115 lng: this.data.longitude,
116 }; 116 };
117 app.post(url, params, header).then((res) => { 117 app.post(url, params, header).then((res) => {
118 - console.log('打卡结果', res);  
119 - if (res.data.is_success) {  
120 - this.setData({ 118 + // console.log('打卡结果', res);
  119 + if (res.data.is_success) { this.setData({
121 punchState: false, 120 punchState: false,
122 'state_data.is_showSuccessModal': true, 121 'state_data.is_showSuccessModal': true,
123 }) 122 })
@@ -5,6 +5,8 @@ @@ -5,6 +5,8 @@
5 display: flex; 5 display: flex;
6 flex-direction: column; 6 flex-direction: column;
7 justify-content: space-between; 7 justify-content: space-between;
  8 + /* padding: 32rpx; */
  9 + /* box-sizing: border-box; */
8 } 10 }
9 .head { 11 .head {
10 width: 100%; 12 width: 100%;
@@ -16,7 +18,7 @@ @@ -16,7 +18,7 @@
16 } 18 }
17 .img_box { 19 .img_box {
18 width: 100%; 20 width: 100%;
19 - height: 400rpx; 21 + height: 300rpx;
20 } 22 }
21 .activity_img { 23 .activity_img {
22 width: 100%; 24 width: 100%;
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 "list": [] 36 "list": []
37 }, 37 },
38 "miniprogram": { 38 "miniprogram": {
39 - "current": 4, 39 + "current": 5,
40 "list": [ 40 "list": [
41 { 41 {
42 "id": -1, 42 "id": -1,
@@ -67,6 +67,13 @@ @@ -67,6 +67,13 @@
67 "name": "参与团购", 67 "name": "参与团购",
68 "pathName": "pages/my/takeGroupBuy/takeGroupBuy", 68 "pathName": "pages/my/takeGroupBuy/takeGroupBuy",
69 "query": "group_id=90" 69 "query": "group_id=90"
  70 + },
  71 + {
  72 + "id": -1,
  73 + "name": "aa",
  74 + "pathName": "pages/index/activity-detail/activity-detail",
  75 + "query": "id=12",
  76 + "scene": null
70 } 77 }
71 ] 78 ]
72 } 79 }
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </template> 18 </template>
19 19
20 <template name="wxParseImg"> 20 <template name="wxParseImg">
21 - <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style="width:{{item.width}}px;" 21 + <image class="{{item.classStr}} wxParse-{{item.tag}}" data-from="{{item.from}}" data-src="{{item.attr.src}}" data-idx="{{item.imgIndex}}" src="{{item.attr.src}}" mode="aspectFit" bindload="wxParseImgLoad" bindtap="wxParseImgTap" mode="widthFix" style=""
22 /> 22 />
23 </template> 23 </template>
24 24