miniprogram / ScienceCaptain · 提交

转到一个项目

作者 吴孟雨
提交 64d2bc883a0e06b01bc573c7790aec992373c48a 1 个父辈 172bfb94

modal 模板

内嵌 并排对比
正在显示 7 个修改的文件 包含 388 行增加 和 199 行删除
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="commit">
  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.js" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" afterDir="false" />
  7 + <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" />
  8 + <change beforePath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" afterDir="false" />
  9 + <change beforePath="$PROJECT_DIR$/project.config.json" beforeDir="false" afterPath="$PROJECT_DIR$/project.config.json" afterDir="false" />
  10 + <change beforePath="$PROJECT_DIR$/templates/templates.wxml" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxml" afterDir="false" />
  11 + <change beforePath="$PROJECT_DIR$/templates/templates.wxss" beforeDir="false" afterPath="$PROJECT_DIR$/templates/templates.wxss" afterDir="false" />
  12 + </list>
5 <ignored path="$PROJECT_DIR$/.tmp/" /> 13 <ignored path="$PROJECT_DIR$/.tmp/" />
6 <ignored path="$PROJECT_DIR$/temp/" /> 14 <ignored path="$PROJECT_DIR$/temp/" />
7 <ignored path="$PROJECT_DIR$/tmp/" /> 15 <ignored path="$PROJECT_DIR$/tmp/" />
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 16 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 - <option name="TRACKING_ENABLED" value="true" />  
10 <option name="SHOW_DIALOG" value="false" /> 17 <option name="SHOW_DIALOG" value="false" />
11 <option name="HIGHLIGHT_CONFLICTS" value="true" /> 18 <option name="HIGHLIGHT_CONFLICTS" value="true" />
12 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> 19 <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
13 <option name="LAST_RESOLUTION" value="IGNORE" /> 20 <option name="LAST_RESOLUTION" value="IGNORE" />
14 </component> 21 </component>
  22 + <component name="FUSProjectUsageTrigger">
  23 + <session id="-381596063">
  24 + <usages-collector id="statistics.lifecycle.project">
  25 + <counts>
  26 + <entry key="project.open.time.1" value="1" />
  27 + <entry key="project.opened" value="1" />
  28 + </counts>
  29 + </usages-collector>
  30 + <usages-collector id="statistics.file.extensions.open">
  31 + <counts>
  32 + <entry key="js" value="1" />
  33 + <entry key="json" value="1" />
  34 + <entry key="wxml" value="3" />
  35 + <entry key="wxss" value="3" />
  36 + </counts>
  37 + </usages-collector>
  38 + <usages-collector id="statistics.file.types.open">
  39 + <counts>
  40 + <entry key="CSS" value="3" />
  41 + <entry key="HTML" value="3" />
  42 + <entry key="JSON" value="1" />
  43 + <entry key="JavaScript" value="1" />
  44 + </counts>
  45 + </usages-collector>
  46 + <usages-collector id="statistics.file.extensions.edit">
  47 + <counts>
  48 + <entry key="js" value="56" />
  49 + <entry key="wxml" value="107" />
  50 + <entry key="wxss" value="21" />
  51 + </counts>
  52 + </usages-collector>
  53 + <usages-collector id="statistics.file.types.edit">
  54 + <counts>
  55 + <entry key="CSS" value="21" />
  56 + <entry key="HTML" value="107" />
  57 + <entry key="JavaScript" value="56" />
  58 + </counts>
  59 + </usages-collector>
  60 + </session>
  61 + </component>
15 <component name="FileEditorManager"> 62 <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"> 63 + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
  64 + <file pinned="false" current-in-tab="false">
  65 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
19 <provider selected="true" editor-type-id="text-editor"> 66 <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" /> 67 + <state relative-caret-position="608">
  68 + <caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
22 </state> 69 </state>
23 </provider> 70 </provider>
24 </entry> 71 </entry>
25 </file> 72 </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" /> 73 + <file pinned="false" current-in-tab="false">
  74 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
  75 + <provider selected="true" editor-type-id="text-editor">
  76 + <state relative-caret-position="22">
  77 + <caret line="1" selection-start-line="1" selection-end-line="2" />
  78 + </state>
  79 + </provider>
29 </entry> 80 </entry>
30 </file> 81 </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" /> 82 + <file pinned="false" current-in-tab="false">
  83 + <entry file="file://$PROJECT_DIR$/project.config.json">
  84 + <provider selected="true" editor-type-id="text-editor">
  85 + <state relative-caret-position="352">
  86 + <caret line="16" column="21" lean-forward="true" selection-start-line="16" selection-start-column="21" selection-end-line="16" selection-end-column="21" />
  87 + </state>
  88 + </provider>
34 </entry> 89 </entry>
35 </file> 90 </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" /> 91 + <file pinned="false" current-in-tab="false">
  92 + <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
  93 + <provider selected="true" editor-type-id="text-editor">
  94 + <state relative-caret-position="718">
  95 + <caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
  96 + </state>
  97 + </provider>
39 </entry> 98 </entry>
40 </file> 99 </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" /> 100 + <file pinned="false" current-in-tab="false">
  101 + <entry file="file://$PROJECT_DIR$/templates/templates.wxss">
  102 + <provider selected="true" editor-type-id="text-editor">
  103 + <state>
  104 + <caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
  105 + </state>
  106 + </provider>
  107 + </entry>
  108 + </file>
  109 + <file pinned="false" current-in-tab="false">
  110 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
  111 + <provider selected="true" editor-type-id="text-editor">
  112 + <state relative-caret-position="462">
  113 + <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
  114 + </state>
  115 + </provider>
  116 + </entry>
  117 + </file>
  118 + <file pinned="false" current-in-tab="true">
  119 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
  120 + <provider selected="true" editor-type-id="text-editor">
  121 + <state relative-caret-position="416">
  122 + <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
  123 + </state>
  124 + </provider>
44 </entry> 125 </entry>
45 </file> 126 </file>
46 - <file leaf-file-name="protocol.js" pinned="false" current-in-tab="false"> 127 + <file pinned="false" current-in-tab="false">
  128 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
  129 + <provider selected="true" editor-type-id="text-editor">
  130 + <state relative-caret-position="462">
  131 + <caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
  132 + </state>
  133 + </provider>
  134 + </entry>
  135 + </file>
  136 + <file pinned="false" current-in-tab="false">
47 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js"> 137 <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
48 <provider selected="true" editor-type-id="text-editor" /> 138 <provider selected="true" editor-type-id="text-editor" />
49 </entry> 139 </entry>
50 </file> 140 </file>
51 - <file leaf-file-name="myCard.wxml" pinned="false" current-in-tab="false"> 141 + <file pinned="false" current-in-tab="false">
52 <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml"> 142 <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
53 <provider selected="true" editor-type-id="text-editor" /> 143 <provider selected="true" editor-type-id="text-editor" />
54 </entry> 144 </entry>
55 </file> 145 </file>
56 </leaf> 146 </leaf>
57 </component> 147 </component>
  148 + <component name="FindInProjectRecents">
  149 + <findStrings>
  150 + <find>chooseYes</find>
  151 + </findStrings>
  152 + </component>
58 <component name="Git.Settings"> 153 <component name="Git.Settings">
59 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> 154 <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
60 </component> 155 </component>
  156 + <component name="IdeDocumentHistory">
  157 + <option name="CHANGED_PATHS">
  158 + <list>
  159 + <option value="$PROJECT_DIR$/templates/templates.wxml" />
  160 + <option value="$PROJECT_DIR$/templates/templates.wxss" />
  161 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss" />
  162 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js" />
  163 + <option value="$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml" />
  164 + </list>
  165 + </option>
  166 + </component>
61 <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" /> 167 <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
62 <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" /> 168 <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
63 <component name="JsGulpfileManager"> 169 <component name="JsGulpfileManager">
64 <detection-done>true</detection-done> 170 <detection-done>true</detection-done>
65 <sorting>DEFINITION_ORDER</sorting> 171 <sorting>DEFINITION_ORDER</sorting>
66 </component> 172 </component>
67 - <component name="NodePackageJsonFileManager">  
68 - <packageJsonPaths />  
69 - </component>  
70 <component name="ProjectFrameBounds" extendedState="6"> 173 <component name="ProjectFrameBounds" extendedState="6">
71 <option name="x" value="339" /> 174 <option name="x" value="339" />
72 <option name="y" value="30" /> 175 <option name="y" value="30" />
@@ -78,7 +181,6 @@ @@ -78,7 +181,6 @@
78 <foldersAlwaysOnTop value="true" /> 181 <foldersAlwaysOnTop value="true" />
79 </navigator> 182 </navigator>
80 <panes> 183 <panes>
81 - <pane id="Scope" />  
82 <pane id="ProjectPane"> 184 <pane id="ProjectPane">
83 <subPane> 185 <subPane>
84 <expand> 186 <expand>
@@ -91,15 +193,34 @@ @@ -91,15 +193,34 @@
91 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" /> 193 <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
92 <item name="pages" type="462c0819:PsiDirectoryNode" /> 194 <item name="pages" type="462c0819:PsiDirectoryNode" />
93 </path> 195 </path>
  196 + <path>
  197 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  198 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  199 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  200 + <item name="index" type="462c0819:PsiDirectoryNode" />
  201 + </path>
  202 + <path>
  203 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  204 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  205 + <item name="pages" type="462c0819:PsiDirectoryNode" />
  206 + <item name="index" type="462c0819:PsiDirectoryNode" />
  207 + <item name="confirm-appointment-info" type="462c0819:PsiDirectoryNode" />
  208 + </path>
  209 + <path>
  210 + <item name="ScienceCaptain" type="b2602c69:ProjectViewProjectNode" />
  211 + <item name="ScienceCaptain" type="462c0819:PsiDirectoryNode" />
  212 + <item name="templates" type="462c0819:PsiDirectoryNode" />
  213 + </path>
94 </expand> 214 </expand>
95 <select /> 215 <select />
96 </subPane> 216 </subPane>
97 </pane> 217 </pane>
  218 + <pane id="Scope" />
98 </panes> 219 </panes>
99 </component> 220 </component>
100 <component name="PropertiesComponent"> 221 <component name="PropertiesComponent">
101 <property name="WebServerToolWindowFactoryState" value="false" /> 222 <property name="WebServerToolWindowFactoryState" value="false" />
102 - <property name="last_opened_file_path" value="D:/git_folder" /> 223 + <property name="last_opened_file_path" value="D:/公众号/福牌" />
103 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 224 <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" /> 225 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
105 </component> 226 </component>
@@ -126,32 +247,33 @@ @@ -126,32 +247,33 @@
126 <option name="presentableId" value="Default" /> 247 <option name="presentableId" value="Default" />
127 <updated>1542334789245</updated> 248 <updated>1542334789245</updated>
128 <workItem from="1542334792985" duration="236000" /> 249 <workItem from="1542334792985" duration="236000" />
  250 + <workItem from="1542249556873" duration="4256000" />
129 </task> 251 </task>
130 <servers /> 252 <servers />
131 </component> 253 </component>
132 <component name="TimeTrackingManager"> 254 <component name="TimeTrackingManager">
133 - <option name="totallyTimeSpent" value="236000" /> 255 + <option name="totallyTimeSpent" value="4492000" />
134 </component> 256 </component>
135 <component name="ToolWindowManager"> 257 <component name="ToolWindowManager">
136 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 258 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
137 <layout> 259 <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" /> 260 + <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" /> 261 <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" /> 262 + <window_info id="Favorites" order="2" side_tool="true" />
  263 + <window_info anchor="bottom" id="Message" order="0" />
148 <window_info anchor="bottom" id="Find" order="1" /> 264 <window_info anchor="bottom" id="Find" order="1" />
  265 + <window_info anchor="bottom" id="Run" order="2" />
  266 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  267 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  268 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  269 + <window_info anchor="bottom" id="TODO" order="6" />
  270 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  271 + <window_info anchor="bottom" id="Terminal" order="8" weight="0.329718" />
  272 + <window_info anchor="bottom" id="Event Log" order="9" side_tool="true" />
  273 + <window_info active="true" anchor="bottom" id="Version Control" order="10" visible="true" weight="0.3275488" />
149 <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" /> 274 <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" /> 275 <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" /> 276 <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> 277 </layout>
156 </component> 278 </component>
157 <component name="TypeScriptGeneratedFilesManager"> 279 <component name="TypeScriptGeneratedFilesManager">
@@ -187,41 +309,87 @@ @@ -187,41 +309,87 @@
187 <option name="myLimit" value="2678400000" /> 309 <option name="myLimit" value="2678400000" />
188 </component> 310 </component>
189 <component name="editorHistoryManager"> 311 <component name="editorHistoryManager">
190 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml"> 312 + <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json" />
  313 + <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml" />
  314 + <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss" />
  315 + <entry file="file://$PROJECT_DIR$/app.json">
  316 + <provider selected="true" editor-type-id="text-editor">
  317 + <state relative-caret-position="418">
  318 + <caret line="19" column="36" selection-start-line="19" selection-start-column="36" selection-end-line="19" selection-end-column="36" />
  319 + </state>
  320 + </provider>
  321 + </entry>
  322 + <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">
191 <provider selected="true" editor-type-id="text-editor" /> 323 <provider selected="true" editor-type-id="text-editor" />
192 </entry> 324 </entry>
193 - <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js"> 325 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json">
194 <provider selected="true" editor-type-id="text-editor" /> 326 <provider selected="true" editor-type-id="text-editor" />
195 </entry> 327 </entry>
196 - <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml"> 328 + <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml">
197 <provider selected="true" editor-type-id="text-editor" /> 329 <provider selected="true" editor-type-id="text-editor" />
198 </entry> 330 </entry>
199 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.json"> 331 + <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.wxml">
200 <provider selected="true" editor-type-id="text-editor" /> 332 <provider selected="true" editor-type-id="text-editor" />
201 </entry> 333 </entry>
202 - <entry file="file://$PROJECT_DIR$/pages/my/all-appointment/all-appointment.wxml"> 334 + <entry file="file://$PROJECT_DIR$/pages/my/protocol/protocol.js">
203 <provider selected="true" editor-type-id="text-editor" /> 335 <provider selected="true" editor-type-id="text-editor" />
204 </entry> 336 </entry>
205 - <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.json"> 337 + <entry file="file://$PROJECT_DIR$/pages/my/myCard/myCard.wxml">
206 <provider selected="true" editor-type-id="text-editor" /> 338 <provider selected="true" editor-type-id="text-editor" />
207 </entry> 339 </entry>
208 - <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxml"> 340 + <entry file="file://$PROJECT_DIR$/project.config.json">
209 <provider selected="true" editor-type-id="text-editor"> 341 <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" /> 342 + <state relative-caret-position="352">
  343 + <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> 344 </state>
213 </provider> 345 </provider>
214 </entry> 346 </entry>
215 - <entry file="file://$PROJECT_DIR$/pages/myProfile/myProfile.wxss">  
216 - <provider selected="true" editor-type-id="text-editor" /> 347 + <entry file="file://$PROJECT_DIR$/templates/templates.wxss">
  348 + <provider selected="true" editor-type-id="text-editor">
  349 + <state>
  350 + <caret column="34" lean-forward="true" selection-start-column="34" selection-end-column="34" />
  351 + </state>
  352 + </provider>
217 </entry> 353 </entry>
218 - <entry file="file://$PROJECT_DIR$/pages/my/myProfile/myProfile.wxml">  
219 - <provider selected="true" editor-type-id="text-editor" /> 354 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxml">
  355 + <provider selected="true" editor-type-id="text-editor">
  356 + <state relative-caret-position="608">
  357 + <caret line="34" selection-start-line="34" selection-end-line="38" selection-end-column="11" />
  358 + </state>
  359 + </provider>
220 </entry> 360 </entry>
221 - <entry file="file://$PROJECT_DIR$/app.json"> 361 + <entry file="file://$PROJECT_DIR$/pages/index/index.wxss">
  362 + <provider selected="true" editor-type-id="text-editor">
  363 + <state relative-caret-position="22">
  364 + <caret line="1" selection-start-line="1" selection-end-line="2" />
  365 + </state>
  366 + </provider>
  367 + </entry>
  368 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxss">
  369 + <provider selected="true" editor-type-id="text-editor">
  370 + <state relative-caret-position="462">
  371 + <caret line="21" column="6" selection-start-line="21" selection-start-column="6" selection-end-line="21" selection-end-column="6" />
  372 + </state>
  373 + </provider>
  374 + </entry>
  375 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.js">
  376 + <provider selected="true" editor-type-id="text-editor">
  377 + <state relative-caret-position="462">
  378 + <caret line="42" column="10" lean-forward="true" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
  379 + </state>
  380 + </provider>
  381 + </entry>
  382 + <entry file="file://$PROJECT_DIR$/templates/templates.wxml">
  383 + <provider selected="true" editor-type-id="text-editor">
  384 + <state relative-caret-position="718">
  385 + <caret line="60" column="11" lean-forward="true" selection-start-line="60" selection-start-column="11" selection-end-line="60" selection-end-column="11" />
  386 + </state>
  387 + </provider>
  388 + </entry>
  389 + <entry file="file://$PROJECT_DIR$/pages/index/confirm-appointment-info/confirm-appointment-info.wxml">
222 <provider selected="true" editor-type-id="text-editor"> 390 <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" /> 391 + <state relative-caret-position="416">
  392 + <caret line="53" lean-forward="true" selection-start-line="53" selection-end-line="53" />
225 </state> 393 </state>
226 </provider> 394 </provider>
227 </entry> 395 </entry>
@@ -6,8 +6,13 @@ Page({ @@ -6,8 +6,13 @@ Page({
6 */ 6 */
7 data: { 7 data: {
8 show: false, 8 show: false,
9 - is_showModal: false,  
10 - is_showSuccessModal: false, 9 + modal_data: {
  10 + is_showModal: false,
  11 + currentBtn: null,
  12 + },
  13 + state_data: {
  14 + is_showSuccessModal: false,
  15 + },
11 children: [{name:'张三',is_choose: true}, 16 children: [{name:'张三',is_choose: true},
12 {name:'李思思', is_choose: false}, 17 {name:'李思思', is_choose: false},
13 {name:'迪丽热巴-迪力木拉提',is_choose: false}], 18 {name:'迪丽热巴-迪力木拉提',is_choose: false}],
@@ -21,21 +26,24 @@ Page({ @@ -21,21 +26,24 @@ Page({
21 }) 26 })
22 }, 27 },
23 submit() { 28 submit() {
24 - this.setData({is_showModal: true}) 29 + this.setData({'modal_data.is_showModal': true})
25 }, 30 },
26 chooseNo(e) { 31 chooseNo(e) {
27 - this.setData({currentBtn: e.currentTarget.dataset.index,is_showModal: false}) 32 + this.setData({
  33 + 'modal_data.currentBtn': e.currentTarget.dataset.index,
  34 + 'modal_data.is_showModal': false
  35 + });
28 wx.switchTab({url: '/pages/index/index'}) 36 wx.switchTab({url: '/pages/index/index'})
29 }, 37 },
30 chooseYes(e) { 38 chooseYes(e) {
31 this.setData({ 39 this.setData({
32 - currentBtn: e.currentTarget.dataset.index,  
33 - is_showModal: false,  
34 - is_showSuccessModal: true 40 + 'modal_data.currentBtn': e.currentTarget.dataset.index,
  41 + 'modal_data.is_showModal': false,
  42 + 'state_data.is_showSuccessModal': true
35 }) 43 })
36 }, 44 },
37 modalConfirm() { 45 modalConfirm() {
38 - this.setData({is_showSuccessModal: false}) 46 + this.setData({'state_data.is_showSuccessModal': false})
39 }, 47 },
40 disableScroll() {}, 48 disableScroll() {},
41 addStudent() { 49 addStudent() {
@@ -48,37 +48,8 @@ @@ -48,37 +48,8 @@
48 <text>确认预约</text> 48 <text>确认预约</text>
49 </view> 49 </view>
50 </view> 50 </view>
51 - <!--是否购买畅玩卡弹窗-->  
52 - <view class="modal_box" wx:if="{{is_showModal}}" catchtouchmove="disableScroll">  
53 - <view class="background"  
54 - bindtap="handleBackground"  
55 - wx:if="{{is_showModal}}"  
56 - catchtouchmove="disableScroll">  
57 - </view>  
58 - <view class="modalBackground Augly-bouncein">  
59 - <view class="modal">  
60 - <view class="tips-word">当前学员还没有购买/兑换畅玩卡，暂不能预约实验活动，是否马上购买/兑换？</view>  
61 - <view class="yes-no-btn">  
62 - <text bindtap="chooseNo" class="{{currentBtn == 0?'change-color':''}}" data-index="{{0}}">否</text>  
63 - <text bindtap="chooseYes" class="{{currentBtn == 1?'change-color':''}}" data-index="{{1}}">是</text>  
64 - </view>  
65 - </view>  
66 - </view>  
67 - </view>  
68 - <!--预约成功弹窗-->  
69 - <view class="modal_box" wx:if="{{is_showSuccessModal}}" catchtouchmove="disableScroll">  
70 - <view class="background"  
71 - bindtap="handleBackground"  
72 - wx:if="{{is_showSuccessModal}}"  
73 - catchtouchmove="disableScroll">  
74 - </view>  
75 - <view class="modalBackground Augly-bouncein">  
76 - <view class="success-modal">  
77 - <image src="../../../images/success.jpg"></image>  
78 - <view class="congratulations">恭喜您</view>  
79 - <view class="appointment-success">您已经预约成功!</view>  
80 - <view class="confirm-btn" bindtap="modalConfirm">确定</view>  
81 - </view>  
82 - </view>  
83 - </view> 51 + <import src="/templates/templates.wxml" />
  52 + <template is="modal" data="{{...modal_data}}"></template>
  53 + <template is="state-modal" data="{{...state_data}}"></template>
  54 +
84 </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 },
@@ -20,4 +20,43 @@ @@ -20,4 +20,43 @@
20 </view> 20 </view>
21 </view> 21 </view>
22 </view> 22 </view>
  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>
23 </template> 62 </template>
@@ -66,4 +66,108 @@ @@ -66,4 +66,108 @@
66 font-size: 30rpx; 66 font-size: 30rpx;
67 text-align: center; 67 text-align: center;
68 border-radius: 10rpx; 68 border-radius: 10rpx;
  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;
69 } 173 }