miniprogram / ScienceCaptain · 提交

转到一个项目

作者 刘晓艳
提交 625f68317f617738d120bd34bdb76b040f6f18aa 2 个父辈 3ac1bf7a 86a6a94b

Merge remote-tracking branch 'origin/wumengyu' 

# Conflicts:
#	pages/index/confirm-appointment-info/confirm-appointment-info.js
#	pages/index/confirm-appointment-info/confirm-appointment-info.wxml
内嵌 并排对比
正在显示 7 个修改的文件 包含 404 行增加 和 242 行删除
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="commit" /> 4 + <list default="true" id="632eecf6-91e3-4185-aea4-06d243e51935" name="Default" comment="modal 模板">
  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/confirm-appointment-info/confirm-appointment-info.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" afterDir="false" />
  7 + </list>
5 <ignored path="$PROJECT_DIR$/.tmp/" /> 8 <ignored path="$PROJECT_DIR$/.tmp/" />
6 <ignored path="$PROJECT_DIR$/temp/" /> 9 <ignored path="$PROJECT_DIR$/temp/" />
7 <ignored path="$PROJECT_DIR$/tmp/" /> 10 <ignored path="$PROJECT_DIR$/tmp/" />
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 11 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 - <option name="TRACKING_ENABLED" value="true" />  
10 <option name="SHOW_DIALOG" value="false" /> 12 <option name="SHOW_DIALOG" value="false" />
11 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 13 <option name="HIGHLIGHT_CONFLICTS" value="true" />
12 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 14 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13 <option name="LAST_RESOLUTION" value="IGNORE" /> 15 <option name="LAST_RESOLUTION" value="IGNORE" />
14 </component> 16 </component>
  17 + <component name="FUSProjectUsageTrigger">
  18 + <session id="-381596063">
  19 + <usages-collector id="statistics.lifecycle.project">
  20 + <counts>
  21 + <entry key="project.open.time.1" value="1" />
  22 + <entry key="project.opened" value="1" />
  23 + </counts>
  24 + </usages-collector>
  25 + <usages-collector id="statistics.file.extensions.open">
  26 + <counts>
  27 + <entry key="js" value="1" />
  28 + <entry key="json" value="1" />
  29 + <entry key="wxml" value="3" />
  30 + <entry key="wxss" value="3" />
  31 + </counts>
  32 + </usages-collector>
  33 + <usages-collector id="statistics.file.types.open">
  34 + <counts>
  35 + <entry key="CSS" value="3" />
  36 + <entry key="HTML" value="3" />
  37 + <entry key="JSON" value="1" />
  38 + <entry key="JavaScript" value="1" />
  39 + </counts>
  40 + </usages-collector>
  41 + <usages-collector id="statistics.file.extensions.edit">
  42 + <counts>
  43 + <entry key="js" value="56" />
  44 + <entry key="txt" value="18" />
  45 + <entry key="wxml" value="108" />
  46 + <entry key="wxss" value="21" />
  47 + </counts>
  48 + </usages-collector>
  49 + <usages-collector id="statistics.file.types.edit">
  50 + <counts>
  51 + <entry key="CSS" value="21" />
  52 + <entry key="HTML" value="108" />
  53 + <entry key="JavaScript" value="56" />
  54 + <entry key="PLAIN_TEXT" value="18" />
  55 + </counts>
  56 + </usages-collector>
  57 + </session>
  58 + </component>
15 <component name="FileEditorManager"> 59 <component name="FileEditorManager">
16 - <leaf>  
17 - <file leaf-file-name="app.json" pinned="false" current-in-tab="true">  
18 - <entry file="file://$PROJECT_DIR$/app.json"> 60 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  61 + <file pinned="false" current-in-tab="false">
  62 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
19 <provider selected="true" editor-type-id="text-editor"> 63 <provider selected="true" editor-type-id="text-editor">
20 - <state relative-caret-position="270">  
21 - <caret line="19" column="36" lean-forward="true" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" /> 64 + <state relative-caret-position="608">
  65 + <caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
22 </state> 66 </state>
23 </provider> 67 </provider>
24 </entry> 68 </entry>
25 </file> 69 </file>
26 - <file leaf-file-name="myProfile.wxml" pinned="false" current-in-tab="false">  
27 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">  
28 - <provider selected="true" editor-type-id="text-editor" /> 70 + <file pinned="false" current-in-tab="false">
  71 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
  72 + <provider selected="true" editor-type-id="text-editor">
  73 + <state relative-caret-position="22">
  74 + <caret line="1" selection-start-line="1" selection-end-line="2" />
  75 + </state>
  76 + </provider>
29 </entry> 77 </entry>
30 </file> 78 </file>
31 - <file leaf-file-name="all-appointment.json" pinned="false" current-in-tab="false">  
32 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">  
33 - <provider selected="true" editor-type-id="text-editor" /> 79 + <file pinned="false" current-in-tab="false">
  80 + <entry file="file://$PROJECT_DIR$/project.config.json">
  81 + <provider selected="true" editor-type-id="text-editor">
  82 + <state relative-caret-position="352">
  83 + <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
  84 + </state>
  85 + </provider>
34 </entry> 86 </entry>
35 </file> 87 </file>
36 - <file leaf-file-name="all-appointment.wxml" pinned="false" current-in-tab="false">  
37 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">  
38 - <provider selected="true" editor-type-id="text-editor" /> 88 + <file pinned="false" current-in-tab="false">
  89 + <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
  90 + <provider selected="true" editor-type-id="text-editor">
  91 + <state relative-caret-position="718">
  92 + <caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
  93 + </state>
  94 + </provider>
39 </entry> 95 </entry>
40 </file> 96 </file>
41 - <file leaf-file-name="protocol.wxml" pinned="false" current-in-tab="false">  
42 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">  
43 - <provider selected="true" editor-type-id="text-editor" /> 97 + <file pinned="false" current-in-tab="false">
  98 + <entry file="file://$PROJECT_DIR$/templates/templates.wxss">
  99 + <provider selected="true" editor-type-id="text-editor">
  100 + <state>
  101 + <caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
  102 + </state>
  103 + </provider>
  104 + </entry>
  105 + </file>
  106 + <file pinned="false" current-in-tab="false">
  107 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
  108 + <provider selected="true" editor-type-id="text-editor">
  109 + <state relative-caret-position="462">
  110 + <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
  111 + </state>
  112 + </provider>
  113 + </entry>
  114 + </file>
  115 + <file pinned="false" current-in-tab="true">
  116 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
  117 + <provider selected="true" editor-type-id="text-editor">
  118 + <state relative-caret-position="370">
  119 + <caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" />
  120 + </state>
  121 + </provider>
44 </entry> 122 </entry>
45 </file> 123 </file>
46 - <file leaf-file-name="protocol.js" pinned="false" current-in-tab="false"> 124 + <file pinned="false" current-in-tab="false">
  125 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
  126 + <provider selected="true" editor-type-id="text-editor">
  127 + <state relative-caret-position="462">
  128 + <caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
  129 + </state>
  130 + </provider>
  131 + </entry>
  132 + </file>
  133 + <file pinned="false" current-in-tab="false">
47 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js"> 134 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
48 <provider selected="true" editor-type-id="text-editor" /> 135 <provider selected="true" editor-type-id="text-editor" />
49 </entry> 136 </entry>
50 </file> 137 </file>
51 - <file leaf-file-name="myCard.wxml" pinned="false" current-in-tab="false"> 138 + <file pinned="false" current-in-tab="false">
52 <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml"> 139 <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
53 <provider selected="true" editor-type-id="text-editor" /> 140 <provider selected="true" editor-type-id="text-editor" />
54 </entry> 141 </entry>
55 </file> 142 </file>
56 </leaf> 143 </leaf>
57 </component> 144 </component>
  145 + <component name="FindInProjectRecents">
  146 + <findStrings>
  147 + <find>chooseYes</find>
  148 + </findStrings>
  149 + </component>
58 <component name="Git.Settings"> 150 <component name="Git.Settings">
59 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 151 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
60 </component> 152 </component>
  153 + <component name="IdeDocumentHistory">
  154 + <option name="CHANGED_PATHS">
  155 + <list>
  156 + <option value="$PROJECT_DIR$/templates/templates.wxml" />
  157 + <option value="$PROJECT_DIR$/templates/templates.wxss" />
  158 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
  159 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
  160 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
  161 + </list>
  162 + </option>
  163 + </component>
61 <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> 164 <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
62 <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> 165 <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
63 <component name="JsGulpfileManager"> 166 <component name="JsGulpfileManager">
64 <detection-done>true</detection-done> 167 <detection-done>true</detection-done>
65 <sorting>DEFINITION_ORDER</sorting> 168 <sorting>DEFINITION_ORDER</sorting>
66 </component> 169 </component>
67 - <component name="NodePackageJsonFileManager">  
68 - <packageJsonPaths />  
69 - </component>  
70 <component name="ProjectFrameBounds" extendedState="6"> 170 <component name="ProjectFrameBounds" extendedState="6">
71 - <option name="x" value="339" />  
72 - <option name="y" value="30" /> 171 + <option name="y" value="22" />
73 <option name="width" value="1936" /> 172 <option name="width" value="1936" />
74 <option name="height" value="1047" /> 173 <option name="height" value="1047" />
75 </component> 174 </component>
@@ -78,7 +177,6 @@ @@ -78,7 +177,6 @@
78 <foldersAlwaysOnTop value="true" /> 177 <foldersAlwaysOnTop value="true" />
79 </navigator> 178 </navigator>
80 <panes> 179 <panes>
81 - <pane id="Scope" />  
82 <pane id="ProjectPane"> 180 <pane id="ProjectPane">
83 <subPane> 181 <subPane>
84 <expand> 182 <expand>
@@ -91,17 +189,37 @@ @@ -91,17 +189,37 @@
91 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 189 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
92 <item name="pages" type="462c0819:PsiDirectoryNode" /> 190 <item name="pages" type="462c0819:PsiDirectoryNode" />
93 </path> 191 </path>
  192 + <path>
  193 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  194 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  195 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  196 + <item name="index" type="462c0819:PsiDirectoryNode" />
  197 + </path>
  198 + <path>
  199 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  200 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  201 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  202 + <item name="index" type="462c0819:PsiDirectoryNode" />
  203 + <item name="confirm-appointment-info" type="462c0819:PsiDirectoryNode" />
  204 + </path>
  205 + <path>
  206 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  207 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  208 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  209 + </path>
94 </expand> 210 </expand>
95 <select /> 211 <select />
96 </subPane> 212 </subPane>
97 </pane> 213 </pane>
  214 + <pane id="Scope" />
98 </panes> 215 </panes>
99 </component> 216 </component>
100 <component name="PropertiesComponent"> 217 <component name="PropertiesComponent">
101 <property name="WebServerToolWindowFactoryState" value="false" /> 218 <property name="WebServerToolWindowFactoryState" value="false" />
102 - <property name="last_opened_file_path" value="D:/git_folder" /> 219 + <property name="last_opened_file_path" value="D:/公众号/福牌" />
103 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 220 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
104 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 221 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
  222 + <property name="settings.editor.selected.configurable" value="project.propDebugger" />
105 </component> 223 </component>
106 <component name="RunDashboard"> 224 <component name="RunDashboard">
107 <option name="ruleStates"> 225 <option name="ruleStates">
@@ -126,32 +244,42 @@ @@ -126,32 +244,42 @@
126 <option name="presentableId" value="Default" /> 244 <option name="presentableId" value="Default" />
127 <updated>1542334789245</updated> 245 <updated>1542334789245</updated>
128 <workItem from="1542334792985" duration="236000" /> 246 <workItem from="1542334792985" duration="236000" />
  247 + <workItem from="1542249556873" duration="5520000" />
129 </task> 248 </task>
  249 + <task id="LOCAL-00001" summary="modal 模板">
  250 + <created>1542274356914</created>
  251 + <option name="number" value="00001" />
  252 + <option name="presentableId" value="LOCAL-00001" />
  253 + <option name="project" value="LOCAL" />
  254 + <updated>1542274356914</updated>
  255 + </task>
  256 + <option name="localTasksCounter" value="2" />
130 <servers /> 257 <servers />
131 </component> 258 </component>
132 <component name="TimeTrackingManager"> 259 <component name="TimeTrackingManager">
133 - <option name="totallyTimeSpent" value="236000" /> 260 + <option name="totallyTimeSpent" value="5756000" />
134 </component> 261 </component>
135 <component name="ToolWindowManager"> 262 <component name="ToolWindowManager">
136 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 263 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
  264 + <editor active="true" />
137 <layout> 265 <layout>
138 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24973656" />  
139 - <window_info anchor="bottom" id="TODO" order="6" />  
140 - <window_info anchor="bottom" id="Docker" show_stripe_button="false" />  
141 - <window_info anchor="bottom" id="Event Log" side_tool="true" />  
142 - <window_info anchor="bottom" id="Version Control" visible="true" weight="0.3293348" />  
143 - <window_info anchor="bottom" id="Run" order="2" /> 266 + <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13382508" />
144 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 267 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
145 - <window_info anchor="bottom" id="Terminal" />  
146 - <window_info id="Favorites" side_tool="true" />  
147 - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" /> 268 + <window_info id="Favorites" order="2" side_tool="true" />
  269 + <window_info anchor="bottom" id="Message" order="0" />
148 <window_info anchor="bottom" id="Find" order="1" /> 270 <window_info anchor="bottom" id="Find" order="1" />
  271 + <window_info anchor="bottom" id="Run" order="2" />
  272 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  273 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  274 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  275 + <window_info anchor="bottom" id="TODO" order="6" />
  276 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  277 + <window_info active="true" anchor="bottom" id="Terminal" order="8" visible="true" weight="0.329718" />
  278 + <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
  279 + <window_info anchor="bottom" id="Version Control" order="10" weight="0.3275488" />
149 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 280 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
150 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" /> 281 <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
151 - <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />  
152 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 282 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
153 - <window_info anchor="bottom" id="Message" order="0" />  
154 - <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />  
155 </layout> 283 </layout>
156 </component> 284 </component>
157 <component name="TypeScriptGeneratedFilesManager"> 285 <component name="TypeScriptGeneratedFilesManager">
@@ -186,42 +314,92 @@ @@ -186,42 +314,92 @@
186 <component name="VcsContentAnnotationSettings"> 314 <component name="VcsContentAnnotationSettings">
187 <option name="myLimit" value="2678400000" /> 315 <option name="myLimit" value="2678400000" />
188 </component> 316 </component>
  317 + <component name="VcsManagerConfiguration">
  318 + <MESSAGE value="modal 模板" />
  319 + <option name="LAST_COMMIT_MESSAGE" value="modal 模板" />
  320 + </component>
189 <component name="editorHistoryManager"> 321 <component name="editorHistoryManager">
190 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml"> 322 + <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json" />
  323 + <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml" />
  324 + <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss" />
  325 + <entry file="file://$PROJECT_DIR$/app.json">
  326 + <provider selected="true" editor-type-id="text-editor">
  327 + <state relative-caret-position="418">
  328 + <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
  329 + </state>
  330 + </provider>
  331 + </entry>
  332 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
191 <provider selected="true" editor-type-id="text-editor" /> 333 <provider selected="true" editor-type-id="text-editor" />
192 </entry> 334 </entry>
193 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js"> 335 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">
194 <provider selected="true" editor-type-id="text-editor" /> 336 <provider selected="true" editor-type-id="text-editor" />
195 </entry> 337 </entry>
196 - <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml"> 338 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
197 <provider selected="true" editor-type-id="text-editor" /> 339 <provider selected="true" editor-type-id="text-editor" />
198 </entry> 340 </entry>
199 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json"> 341 + <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
200 <provider selected="true" editor-type-id="text-editor" /> 342 <provider selected="true" editor-type-id="text-editor" />
201 </entry> 343 </entry>
202 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml"> 344 + <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
203 <provider selected="true" editor-type-id="text-editor" /> 345 <provider selected="true" editor-type-id="text-editor" />
204 </entry> 346 </entry>
205 - <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json"> 347 + <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
206 <provider selected="true" editor-type-id="text-editor" /> 348 <provider selected="true" editor-type-id="text-editor" />
207 </entry> 349 </entry>
208 - <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml"> 350 + <entry file="file://$PROJECT_DIR$/project.config.json">
209 <provider selected="true" editor-type-id="text-editor"> 351 <provider selected="true" editor-type-id="text-editor">
210 - <state relative-caret-position="27">  
211 - <caret line="1" column="1" selection-start-line="1" selection-start-column="1" selection-end-line="1" selection-end-column="43" /> 352 + <state relative-caret-position="352">
  353 + <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
212 </state> 354 </state>
213 </provider> 355 </provider>
214 </entry> 356 </entry>
215 - <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss">  
216 - <provider selected="true" editor-type-id="text-editor" /> 357 + <entry file="file://$PROJECT_DIR$/templates/templates.wxss">
  358 + <provider selected="true" editor-type-id="text-editor">
  359 + <state>
  360 + <caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
  361 + </state>
  362 + </provider>
217 </entry> 363 </entry>
218 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">  
219 - <provider selected="true" editor-type-id="text-editor" /> 364 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
  365 + <provider selected="true" editor-type-id="text-editor">
  366 + <state relative-caret-position="608">
  367 + <caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
  368 + </state>
  369 + </provider>
220 </entry> 370 </entry>
221 - <entry file="file://$PROJECT_DIR$/app.json"> 371 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
  372 + <provider selected="true" editor-type-id="text-editor">
  373 + <state relative-caret-position="22">
  374 + <caret line="1" selection-start-line="1" selection-end-line="2" />
  375 + </state>
  376 + </provider>
  377 + </entry>
  378 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
  379 + <provider selected="true" editor-type-id="text-editor">
  380 + <state relative-caret-position="462">
  381 + <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
  382 + </state>
  383 + </provider>
  384 + </entry>
  385 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
  386 + <provider selected="true" editor-type-id="text-editor">
  387 + <state relative-caret-position="462">
  388 + <caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
  389 + </state>
  390 + </provider>
  391 + </entry>
  392 + <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
  393 + <provider selected="true" editor-type-id="text-editor">
  394 + <state relative-caret-position="718">
  395 + <caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
  396 + </state>
  397 + </provider>
  398 + </entry>
  399 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
222 <provider selected="true" editor-type-id="text-editor"> 400 <provider selected="true" editor-type-id="text-editor">
223 - <state relative-caret-position="270">  
224 - <caret line="19" column="36" lean-forward="true" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" /> 401 + <state relative-caret-position="370">
  402 + <caret line="52" column="67" lean-forward="true" selection-start-line="52" selection-start-column="67" selection-end-line="52" selection-end-column="67" />
225 </state> 403 </state>
226 </provider> 404 </provider>
227 </entry> 405 </entry>
@@ -6,22 +6,16 @@ Page({ @@ -6,22 +6,16 @@ Page({
6 */ 6 */
7 data: { 7 data: {
8 show: false, 8 show: false,
  9 + modal_data: {
9 is_showModal: false, 10 is_showModal: false,
  11 + currentBtn: null,
  12 + },
  13 + state_data: {
10 is_showSuccessModal: false, 14 is_showSuccessModal: false,
11 - pay_success: false,  
12 - children: [{  
13 - name: '张三',  
14 - is_choose: true  
15 - },  
16 - {  
17 - name: '李思思',  
18 - is_choose: false  
19 - },  
20 - {  
21 - name: '迪丽热巴-迪力木拉提',  
22 - is_choose: false  
23 - }  
24 - ], 15 + },
  16 + children: [{name:'张三',is_choose: true},
  17 + {name:'李思思', is_choose: false},
  18 + {name:'迪丽热巴-迪力木拉提',is_choose: false}],
25 is_choose: false, 19 is_choose: false,
26 }, 20 },
27 chooseChildren(e) { 21 chooseChildren(e) {
@@ -31,64 +25,34 @@ Page({ @@ -31,64 +25,34 @@ Page({
31 [`children[${current}].is_choose`]: !this.data.children[current].is_choose 25 [`children[${current}].is_choose`]: !this.data.children[current].is_choose
32 }) 26 })
33 }, 27 },
34 - refreshModal() {  
35 - this.setData({  
36 - pay_success: true  
37 - });  
38 - },  
39 submit() { 28 submit() {
40 - if(this.data.pay_success) {  
41 - this.setData({  
42 - is_showModal: false,  
43 - is_showSuccessModal: true,  
44 - });  
45 - }else {  
46 - this.setData({  
47 - is_showModal: true  
48 - });  
49 - } 29 + this.setData({'modal_data.is_showModal': true})
50 }, 30 },
51 chooseNo(e) { 31 chooseNo(e) {
52 this.setData({ 32 this.setData({
53 - currentBtn: e.currentTarget.dataset.index,  
54 - is_showModal: false  
55 - })  
56 - wx.navigateBack({  
57 - delta: 1  
58 - }) 33 + 'modal_data.currentBtn': e.currentTarget.dataset.index,
  34 + 'modal_data.is_showModal': false
  35 + });
  36 + wx.switchTab({url: '/pages/index/index'})
59 }, 37 },
60 - //弹窗确认事件  
61 chooseYes(e) { 38 chooseYes(e) {
62 this.setData({ 39 this.setData({
63 - currentBtn: e.currentTarget.dataset.index,  
64 - is_showModal: false,  
65 - // is_showSuccessModal: true  
66 - })  
67 -  
68 - wx.navigateTo({  
69 - url: '../../my/buyCard/buyCard', 40 + 'modal_data.currentBtn': e.currentTarget.dataset.index,
  41 + 'modal_data.is_showModal': false,
  42 + 'state_data.is_showSuccessModal': true
70 }) 43 })
71 }, 44 },
72 -  
73 modalConfirm() { 45 modalConfirm() {
74 - this.setData({  
75 - is_showSuccessModal: false  
76 - })  
77 - wx.redirectTo({  
78 - url: '../../my/all-appointment/all-appointment?currentTab=' + 2,  
79 - }) 46 + this.setData({'state_data.is_showSuccessModal': false})
80 }, 47 },
81 -  
82 disableScroll() {}, 48 disableScroll() {},
83 addStudent() { 49 addStudent() {
84 - wx.navigateTo({  
85 - url: './add-student/add-student'  
86 - }) 50 + wx.navigateTo({url: './add-student/add-student'})
87 }, 51 },
88 /** 52 /**
89 * 生命周期函数--监听页面加载 53 * 生命周期函数--监听页面加载
90 */ 54 */
91 - onLoad: function(options) { 55 + onLoad: function (options) {
92 56
93 }, 57 },
94 58
@@ -47,31 +47,9 @@ @@ -47,31 +47,9 @@
47 <text>确认预约</text> 47 <text>确认预约</text>
48 </view> 48 </view>
49 </view> 49 </view>
50 - <!--是否购买畅玩卡弹窗-->  
51 - <view class="modal_box" wx:if="{{is_showModal}}" catchtouchmove="disableScroll">  
52 - <view class="background" bindtap="handleBackground" wx:if="{{is_showModal}}" catchtouchmove="disableScroll">  
53 - </view>  
54 - <view class="modalBackground Augly-bouncein">  
55 - <view class="modal">  
56 - <view class="tips-word">当前学员还没有购买/兑换畅玩卡，暂不能预约实验活动，是否马上购买/兑换？</view>  
57 - <view class="yes-no-btn">  
58 - <text bindtap="chooseNo" class="{{currentBtn == 0?'change-color':''}}" data-index="{{0}}">否</text>  
59 - <text bindtap="chooseYes" class="{{currentBtn == 1?'change-color':''}}" data-index="{{1}}">是</text>  
60 - </view>  
61 - </view>  
62 - </view>  
63 - </view>  
64 - <!--预约成功弹窗-->  
65 - <view class="modal_box" wx:if="{{is_showSuccessModal}}" catchtouchmove="disableScroll">  
66 - <view class="background" bindtap="handleBackground" wx:if="{{is_showSuccessModal}}" catchtouchmove="disableScroll">  
67 - </view>  
68 - <view class="modalBackground Augly-bouncein">  
69 - <view class="success-modal">  
70 - <image src="../../../images/success.jpg"></image>  
71 - <view class="congratulations">恭喜您</view>  
72 - <view class="appointment-success">您已经预约成功!</view>  
73 - <view class="confirm-btn" bindtap="modalConfirm">确定</view>  
74 - </view>  
75 - </view>  
76 - </view> 50 + <import src="/templates/templates.wxml" />
  51 + <template is="modal" data="{{...modal_data}}"></template>
  52 + <template is="state-modal" data="{{...state_data}}"></template>
  53 +
  54 +
77 </view> 55 </view>
1 /* pages/index/confirm-appointment-info/confirm-appointment-info.wxss */ 1 /* pages/index/confirm-appointment-info/confirm-appointment-info.wxss */
  2 +@import "../../../templates/templates.wxss";
2 page { 3 page {
3 background-color: #f2f2f2; 4 background-color: #f2f2f2;
4 } 5 }
@@ -136,106 +137,4 @@ page { @@ -136,106 +137,4 @@ page {
136 color: #ffffff; 137 color: #ffffff;
137 line-height: 98rpx; 138 line-height: 98rpx;
138 font-size: 36rpx; 139 font-size: 36rpx;
139 -}.modal_box {  
140 - width: 100%;  
141 - height: 100%;  
142 - position: fixed;  
143 - top: 0;  
144 - left: 0;  
145 - z-index: 999;  
146 - }  
147 -.background {  
148 - width: 100%;  
149 - height: 100%;  
150 - background: rgba(0,0,0,0.3);  
151 - position: absolute;  
152 - top: 0;  
153 - left: 0;  
154 - z-index: 999;  
155 -}  
156 -.modalBackground {  
157 - width: 100%;  
158 - height: 100%;  
159 - position: absolute;  
160 - top: 0;  
161 - left: 0;  
162 - z-index: 999;  
163 - display: -webkit-box;  
164 - display: -ms-flexbox;  
165 - display: flex;  
166 - align-items: center;  
167 - justify-content: center;  
168 - color: #666666;  
169 -}  
170 -.modal {  
171 - width: 500rpx;  
172 - height: 260rpx;  
173 - /* height: 1100rpx; */  
174 - background: #ffffff;  
175 - border-radius: 10rpx;  
176 - box-sizing: border-box;  
177 - /*padding: 70rpx 0 0 0;*/  
178 - overflow: hidden;  
179 - position: relative;  
180 -}  
181 -.success-modal {  
182 - width: 400rpx;  
183 - height: 450rpx;  
184 - display: flex;  
185 - flex-direction: column;  
186 - align-items: center;  
187 - justify-content: center;  
188 - background: #ffffff;  
189 - border-radius: 22rpx;  
190 -}  
191 -.success-modal image {  
192 - width: 236rpx;  
193 - height: 170rpx;  
194 -}  
195 -.congratulations {  
196 - font-size: 28rpx;  
197 - color: #3FA9F5;  
198 - margin-bottom: 14rpx;  
199 -}  
200 -.appointment-success {  
201 - font-size: 24rpx;  
202 - margin-bottom: 60rpx;  
203 -}  
204 -.confirm-btn {  
205 - width: 80%;  
206 - height: 54rpx;  
207 - line-height: 54rpx;  
208 - border-radius: 30rpx;  
209 - text-align: center;  
210 - color: #ffffff;  
211 - font-size: 30rpx;  
212 - background-color: #3FA9F5;  
213 -}  
214 -.tips-word {  
215 - font-size: 26rpx;  
216 - width: 100%;  
217 - padding: 30rpx 40rpx 30rpx 50rpx;  
218 - -webkit-box-sizing: border-box;  
219 - -moz-box-sizing: border-box;  
220 - box-sizing: border-box;  
221 - border-bottom: 1rpx solid #d3d3d3;  
222 - line-height: 38rpx;  
223 -}  
224 -.yes-no-btn {  
225 - width: 100%;  
226 - height: 84rpx;  
227 - display: flex;  
228 - align-items: center;  
229 - font-size: 30rpx;  
230 -}  
231 -.yes-no-btn text {  
232 - width: 50%;  
233 - text-align: center;  
234 - line-height: 68rpx;  
235 -}  
236 -.yes-no-btn text:nth-child(1) {  
237 - border-right: 1rpx solid #d3d3d3;  
238 -}  
239 -.change-color {  
240 - color: #3FA9F5;  
241 } 140 }
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 "compileType": "miniprogram", 13 "compileType": "miniprogram",
14 "libVersion": "2.4.0", 14 "libVersion": "2.4.0",
15 "appid": "wx48319d952ea4e37f", 15 "appid": "wx48319d952ea4e37f",
16 - "projectname": "%E7%A7%91%E5%AD%A6%E9%98%9F%E9%95%BF", 16 + "projectname": "science",
17 "debugOptions": { 17 "debugOptions": {
18 "hidedInDevtools": [] 18 "hidedInDevtools": []
19 }, 19 },
@@ -21,3 +21,42 @@ @@ -21,3 +21,42 @@
21 </view> 21 </view>
22 </view> 22 </view>
23 </template> 23 </template>
  24 +
  25 +<template name="modal">
  26 + <!--是否购买畅玩卡弹窗-->
  27 + <view class="modal_box" wx:if="{{is_showModal}}" catchtouchmove="disableScroll">
  28 + <view class="background"
  29 + bindtap="handleBackground"
  30 + wx:if="{{is_showModal}}"
  31 + catchtouchmove="disableScroll">
  32 + </view>
  33 + <view class="modalBackground Augly-bouncein">
  34 + <view class="modal">
  35 + <view class="tips-word">当前学员还没有购买/兑换畅玩卡，暂不能预约实验活动，是否马上购买/兑换？</view>
  36 + <view class="yes-no-btn">
  37 + <text bindtap="chooseNo" class="{{currentBtn == 0?'change-color':''}}" data-index="{{0}}">否</text>
  38 + <text bindtap="chooseYes" class="{{currentBtn == 1?'change-color':''}}" data-index="{{1}}">是</text>
  39 + </view>
  40 + </view>
  41 + </view>
  42 + </view>
  43 +</template>
  44 +
  45 +<template name="state-modal">
  46 + <!--预约成功弹窗-->
  47 + <view class="modal_box" wx:if="{{is_showSuccessModal}}" catchtouchmove="disableScroll">
  48 + <view class="background"
  49 + bindtap="handleBackground"
  50 + wx:if="{{is_showSuccessModal}}"
  51 + catchtouchmove="disableScroll">
  52 + </view>
  53 + <view class="modalBackground Augly-bouncein">
  54 + <view class="success-modal">
  55 + <image src="../../../images/success.jpg"></image>
  56 + <view class="congratulations">恭喜您</view>
  57 + <view class="appointment-success">您已经预约成功!</view>
  58 + <view class="confirm-btn" bindtap="modalConfirm">确定</view>
  59 + </view>
  60 + </view>
  61 + </view>
  62 +</template>
@@ -67,3 +67,107 @@ @@ -67,3 +67,107 @@
67 text-align: center; 67 text-align: center;
68 border-radius: 10rpx; 68 border-radius: 10rpx;
69 } 69 }
  70 +/*下面是modal样式*/
  71 +.modal_box {
  72 + width: 100%;
  73 + height: 100%;
  74 + position: fixed;
  75 + top: 0;
  76 + left: 0;
  77 + z-index: 999;
  78 +}
  79 +.background {
  80 + width: 100%;
  81 + height: 100%;
  82 + background: rgba(0,0,0,0.3);
  83 + position: absolute;
  84 + top: 0;
  85 + left: 0;
  86 + z-index: 999;
  87 +}
  88 +.modalBackground {
  89 + width: 100%;
  90 + height: 100%;
  91 + position: absolute;
  92 + top: 0;
  93 + left: 0;
  94 + z-index: 999;
  95 + display: -webkit-box;
  96 + display: -ms-flexbox;
  97 + display: flex;
  98 + align-items: center;
  99 + justify-content: center;
  100 + color: #666666;
  101 +}
  102 +.modal {
  103 + width: 500rpx;
  104 + height: 260rpx;
  105 + /* height: 1100rpx; */
  106 + background: #ffffff;
  107 + border-radius: 10rpx;
  108 + box-sizing: border-box;
  109 + /*padding: 70rpx 0 0 0;*/
  110 + overflow: hidden;
  111 + position: relative;
  112 +}
  113 +.success-modal {
  114 + width: 400rpx;
  115 + height: 450rpx;
  116 + display: flex;
  117 + flex-direction: column;
  118 + align-items: center;
  119 + justify-content: center;
  120 + background: #ffffff;
  121 + border-radius: 22rpx;
  122 +}
  123 +.success-modal image {
  124 + width: 236rpx;
  125 + height: 170rpx;
  126 +}
  127 +.congratulations {
  128 + font-size: 28rpx;
  129 + color: #3FA9F5;
  130 + margin-bottom: 14rpx;
  131 +}
  132 +.appointment-success {
  133 + font-size: 24rpx;
  134 + margin-bottom: 60rpx;
  135 +}
  136 +.confirm-btn {
  137 + width: 80%;
  138 + height: 54rpx;
  139 + line-height: 54rpx;
  140 + border-radius: 30rpx;
  141 + text-align: center;
  142 + color: #ffffff;
  143 + font-size: 30rpx;
  144 + background-color: #3FA9F5;
  145 +}
  146 +.tips-word {
  147 + font-size: 26rpx;
  148 + width: 100%;
  149 + padding: 30rpx 40rpx 30rpx 50rpx;
  150 + -webkit-box-sizing: border-box;
  151 + -moz-box-sizing: border-box;
  152 + box-sizing: border-box;
  153 + border-bottom: 1rpx solid #d3d3d3;
  154 + line-height: 38rpx;
  155 +}
  156 +.yes-no-btn {
  157 + width: 100%;
  158 + height: 84rpx;
  159 + display: flex;
  160 + align-items: center;
  161 + font-size: 30rpx;
  162 +}
  163 +.yes-no-btn text {
  164 + width: 50%;
  165 + text-align: center;
  166 + line-height: 68rpx;
  167 +}
  168 +.yes-no-btn text:nth-child(1) {
  169 + border-right: 1rpx solid #d3d3d3;
  170 +}
  171 +.change-color {
  172 + color: #3FA9F5;
  173 +}