作者 xiaohu thinkpad

登录处理

@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/app/user/controller/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -17,42 +17,20 @@ @@ -17,42 +17,20 @@
17 </component> 17 </component>
18 <component name="FileEditorManager"> 18 <component name="FileEditorManager">
19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 - <file leaf-file-name="hezuo_jiuda.htm" pinned="false" current-in-tab="false">  
21 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm"> 20 + <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
  21 + <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
22 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="1932">  
24 - <caret line="797" column="85" selection-start-line="797" selection-start-column="85" selection-end-line="797" selection-end-column="85" /> 23 + <state relative-caret-position="555">
  24 + <caret line="158" column="52" selection-start-line="158" selection-start-column="52" selection-end-line="158" selection-end-column="52" />
25 <folding> 25 <folding>
26 - <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />  
27 - <element signature="n#style#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
28 - <element signature="n#style#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
29 - <element signature="n#style#0;n#img#0;n#div#0;n#div#0;n#a#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
30 - <element signature="n#style#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
31 - <element signature="n#style#0;n#span#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
32 - <element signature="n#style#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
33 - <element signature="n#style#0;n#span#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
34 - <element signature="n#style#0;n#span#0;n#span#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
35 - <element signature="n#style#0;n#span#0;n#font#0;n#div#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
36 - <element signature="n#style#0;n#span#0;n#font#0;n#div#0;n#div#0;n#span#1;n#div#0;n#div#0;n#div#2;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
37 - <element signature="n#style#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
38 - <element signature="n#style#0;n#a#0;n#div#0;n#div#0;n#div#3;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
39 - <element signature="n#style#0;n#ul#0;n#div#0;n#div#1;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
40 - <element signature="n#style#0;n#li#0;n#ul#0;n#div#0;n#div#1;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 26 + <element signature="e#636#668#0#PHP" expanded="true" />
  27 + <element signature="e#17688#17731#0#PHP" />
  28 + <element signature="e#17688#17779#0#PHP" />
41 </folding> 29 </folding>
42 </state> 30 </state>
43 </provider> 31 </provider>
44 </entry> 32 </entry>
45 </file> 33 </file>
46 - <file leaf-file-name="my_order.html" pinned="false" current-in-tab="false">  
47 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/my_order.html">  
48 - <provider selected="true" editor-type-id="text-editor" />  
49 - </entry>  
50 - </file>  
51 - <file leaf-file-name="order_details.html" pinned="false" current-in-tab="false">  
52 - <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details.html">  
53 - <provider selected="true" editor-type-id="text-editor" />  
54 - </entry>  
55 - </file>  
56 <file leaf-file-name="order_details_1.html" pinned="false" current-in-tab="false"> 34 <file leaf-file-name="order_details_1.html" pinned="false" current-in-tab="false">
57 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html"> 35 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html">
58 <provider selected="true" editor-type-id="text-editor"> 36 <provider selected="true" editor-type-id="text-editor">
@@ -80,33 +58,43 @@ @@ -80,33 +58,43 @@
80 </provider> 58 </provider>
81 </entry> 59 </entry>
82 </file> 60 </file>
83 - <file leaf-file-name="index.htm" pinned="false" current-in-tab="false">  
84 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm"> 61 + <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
  62 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
85 <provider selected="true" editor-type-id="text-editor"> 63 <provider selected="true" editor-type-id="text-editor">
86 - <state relative-caret-position="3864">  
87 - <caret line="184" column="28" selection-start-line="184" selection-start-column="28" selection-end-line="184" selection-end-column="46" /> 64 + <state relative-caret-position="321">
  65 + <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
88 </state> 66 </state>
89 </provider> 67 </provider>
90 </entry> 68 </entry>
91 </file> 69 </file>
92 - <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">  
93 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php"> 70 + <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
  71 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
  72 + <provider selected="true" editor-type-id="text-editor" />
  73 + </entry>
  74 + </file>
  75 + <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false">
  76 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
94 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
95 - <state relative-caret-position="321">  
96 - <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" /> 78 + <state relative-caret-position="231">
  79 + <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
97 </state> 80 </state>
98 </provider> 81 </provider>
99 </entry> 82 </entry>
100 </file> 83 </file>
101 - <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true"> 84 + <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
102 <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php"> 85 <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
103 <provider selected="true" editor-type-id="text-editor"> 86 <provider selected="true" editor-type-id="text-editor">
104 - <state relative-caret-position="336">  
105 - <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" /> 87 + <state relative-caret-position="153">
  88 + <caret line="25" column="12" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="34" />
106 </state> 89 </state>
107 </provider> 90 </provider>
108 </entry> 91 </entry>
109 </file> 92 </file>
  93 + <file leaf-file-name="HomeBaseController.php" pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
  95 + <provider selected="true" editor-type-id="text-editor" />
  96 + </entry>
  97 + </file>
110 <file leaf-file-name="pay_success.html" pinned="false" current-in-tab="false"> 98 <file leaf-file-name="pay_success.html" pinned="false" current-in-tab="false">
111 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html"> 99 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
112 <provider selected="true" editor-type-id="text-editor"> 100 <provider selected="true" editor-type-id="text-editor">
@@ -165,7 +153,6 @@ @@ -165,7 +153,6 @@
165 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" /> 153 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
166 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" /> 154 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
167 <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" /> 155 <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
168 - <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />  
169 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" /> 156 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
170 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" /> 157 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
171 <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" /> 158 <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
@@ -173,6 +160,8 @@ @@ -173,6 +160,8 @@
173 <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" /> 160 <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
174 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" /> 161 <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
175 <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" /> 162 <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
  163 + <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
  164 + <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
176 </list> 165 </list>
177 </option> 166 </option>
178 </component> 167 </component>
@@ -256,69 +245,20 @@ @@ -256,69 +245,20 @@
256 <path> 245 <path>
257 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 246 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
258 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 247 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
259 - <item name="public" type="462c0819:PsiDirectoryNode" />  
260 - </path>  
261 - <path>  
262 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
263 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
264 - <item name="public" type="462c0819:PsiDirectoryNode" />  
265 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
266 - </path>  
267 - <path>  
268 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
269 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
270 - <item name="public" type="462c0819:PsiDirectoryNode" />  
271 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
272 - <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />  
273 - </path>  
274 - <path>  
275 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
276 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
277 - <item name="public" type="462c0819:PsiDirectoryNode" />  
278 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
279 - <item name="admin_simpleboot3" type="462c0819:PsiDirectoryNode" />  
280 - <item name="admin" type="462c0819:PsiDirectoryNode" /> 248 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
281 </path> 249 </path>
282 <path> 250 <path>
283 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 251 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
284 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 252 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
285 - <item name="public" type="462c0819:PsiDirectoryNode" />  
286 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
287 - <item name="simpleboot3" type="462c0819:PsiDirectoryNode" /> 253 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  254 + <item name="cmf" type="462c0819:PsiDirectoryNode" />
288 </path> 255 </path>
289 <path> 256 <path>
290 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 257 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
291 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 258 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
292 - <item name="public" type="462c0819:PsiDirectoryNode" />  
293 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
294 - <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />  
295 - <item name="portal" type="462c0819:PsiDirectoryNode" />  
296 - </path>  
297 - <path>  
298 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
299 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
300 - <item name="public" type="462c0819:PsiDirectoryNode" />  
301 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
302 - <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />  
303 - <item name="portal" type="462c0819:PsiDirectoryNode" />  
304 - <item name="index" type="462c0819:PsiDirectoryNode" />  
305 - </path>  
306 - <path>  
307 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
308 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
309 - <item name="public" type="462c0819:PsiDirectoryNode" />  
310 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
311 - <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />  
312 - <item name="user" type="462c0819:PsiDirectoryNode" />  
313 - </path>  
314 - <path>  
315 - <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />  
316 - <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />  
317 - <item name="public" type="462c0819:PsiDirectoryNode" />  
318 - <item name="themes" type="462c0819:PsiDirectoryNode" />  
319 - <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />  
320 - <item name="user" type="462c0819:PsiDirectoryNode" />  
321 - <item name="order" type="462c0819:PsiDirectoryNode" /> 259 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  260 + <item name="cmf" type="462c0819:PsiDirectoryNode" />
  261 + <item name="controller" type="462c0819:PsiDirectoryNode" />
322 </path> 262 </path>
323 </expand> 263 </expand>
324 <select /> 264 <select />
@@ -373,7 +313,7 @@ @@ -373,7 +313,7 @@
373 <workItem from="1535514127808" duration="727000" /> 313 <workItem from="1535514127808" duration="727000" />
374 <workItem from="1535532970259" duration="2527000" /> 314 <workItem from="1535532970259" duration="2527000" />
375 <workItem from="1535546044129" duration="20814000" /> 315 <workItem from="1535546044129" duration="20814000" />
376 - <workItem from="1535633001243" duration="1606000" /> 316 + <workItem from="1535633001243" duration="3011000" />
377 </task> 317 </task>
378 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 318 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
379 <created>1535458170068</created> 319 <created>1535458170068</created>
@@ -599,11 +539,32 @@ @@ -599,11 +539,32 @@
599 <option name="project" value="LOCAL" /> 539 <option name="project" value="LOCAL" />
600 <updated>1535634457149</updated> 540 <updated>1535634457149</updated>
601 </task> 541 </task>
602 - <option name="localTasksCounter" value="33" /> 542 + <task id="LOCAL-00033" summary="我的订单详情标题">
  543 + <created>1535634619847</created>
  544 + <option name="number" value="00033" />
  545 + <option name="presentableId" value="LOCAL-00033" />
  546 + <option name="project" value="LOCAL" />
  547 + <updated>1535634619847</updated>
  548 + </task>
  549 + <task id="LOCAL-00034" summary="登录处理">
  550 + <created>1535635187586</created>
  551 + <option name="number" value="00034" />
  552 + <option name="presentableId" value="LOCAL-00034" />
  553 + <option name="project" value="LOCAL" />
  554 + <updated>1535635187586</updated>
  555 + </task>
  556 + <task id="LOCAL-00035" summary="登录处理">
  557 + <created>1535635277832</created>
  558 + <option name="number" value="00035" />
  559 + <option name="presentableId" value="LOCAL-00035" />
  560 + <option name="project" value="LOCAL" />
  561 + <updated>1535635277832</updated>
  562 + </task>
  563 + <option name="localTasksCounter" value="36" />
603 <servers /> 564 <servers />
604 </component> 565 </component>
605 <component name="TimeTrackingManager"> 566 <component name="TimeTrackingManager">
606 - <option name="totallyTimeSpent" value="56058000" /> 567 + <option name="totallyTimeSpent" value="57463000" />
607 </component> 568 </component>
608 <component name="ToolWindowManager"> 569 <component name="ToolWindowManager">
609 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 570 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -646,15 +607,10 @@ @@ -646,15 +607,10 @@
646 <MESSAGE value="ceshi wode jiaolian" /> 607 <MESSAGE value="ceshi wode jiaolian" />
647 <MESSAGE value="测试获取当前时段的老师" /> 608 <MESSAGE value="测试获取当前时段的老师" />
648 <MESSAGE value="我的订单详情标题" /> 609 <MESSAGE value="我的订单详情标题" />
649 - <option name="LAST_COMMIT_MESSAGE" value="我的订单详情标题" /> 610 + <MESSAGE value="登录处理" />
  611 + <option name="LAST_COMMIT_MESSAGE" value="登录处理" />
650 </component> 612 </component>
651 <component name="editorHistoryManager"> 613 <component name="editorHistoryManager">
652 - <entry file="file://$PROJECT_DIR$/api/route.php">  
653 - <provider selected="true" editor-type-id="text-editor" />  
654 - </entry>  
655 - <entry file="file://$PROJECT_DIR$/api/release.php">  
656 - <provider selected="true" editor-type-id="text-editor" />  
657 - </entry>  
658 <entry file="file://$PROJECT_DIR$/api/debug.php"> 614 <entry file="file://$PROJECT_DIR$/api/debug.php">
659 <provider selected="true" editor-type-id="text-editor" /> 615 <provider selected="true" editor-type-id="text-editor" />
660 </entry> 616 </entry>
@@ -784,11 +740,6 @@ @@ -784,11 +740,6 @@
784 </state> 740 </state>
785 </provider> 741 </provider>
786 </entry> 742 </entry>
787 - <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">  
788 - <provider selected="true" editor-type-id="text-editor">  
789 - <state relative-caret-position="-1701" />  
790 - </provider>  
791 - </entry>  
792 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" /> 743 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
793 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" /> 744 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
794 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log" /> 745 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log" />
@@ -830,18 +781,6 @@ @@ -830,18 +781,6 @@
830 </state> 781 </state>
831 </provider> 782 </provider>
832 </entry> 783 </entry>
833 - <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">  
834 - <provider selected="true" editor-type-id="text-editor">  
835 - <state relative-caret-position="1092">  
836 - <caret line="65" column="34" selection-start-line="65" selection-start-column="34" selection-end-line="65" selection-end-column="34" />  
837 - <folding>  
838 - <element signature="e#636#668#0#PHP" expanded="true" />  
839 - <element signature="e#17688#17731#0#PHP" />  
840 - <element signature="e#17688#17779#0#PHP" />  
841 - </folding>  
842 - </state>  
843 - </provider>  
844 - </entry>  
845 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm"> 784 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
846 <provider selected="true" editor-type-id="text-editor"> 785 <provider selected="true" editor-type-id="text-editor">
847 <state relative-caret-position="7602"> 786 <state relative-caret-position="7602">
@@ -908,13 +847,6 @@ @@ -908,13 +847,6 @@
908 </state> 847 </state>
909 </provider> 848 </provider>
910 </entry> 849 </entry>
911 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">  
912 - <provider selected="true" editor-type-id="text-editor">  
913 - <state relative-caret-position="321">  
914 - <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />  
915 - </state>  
916 - </provider>  
917 - </entry>  
918 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html"> 850 <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
919 <provider selected="true" editor-type-id="text-editor"> 851 <provider selected="true" editor-type-id="text-editor">
920 <state relative-caret-position="420"> 852 <state relative-caret-position="420">
@@ -929,10 +861,42 @@ @@ -929,10 +861,42 @@
929 </state> 861 </state>
930 </provider> 862 </provider>
931 </entry> 863 </entry>
  864 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
  865 + <provider selected="true" editor-type-id="text-editor">
  866 + <state relative-caret-position="321">
  867 + <caret line="113" column="48" lean-forward="true" selection-start-line="113" selection-start-column="48" selection-end-line="113" selection-end-column="48" />
  868 + </state>
  869 + </provider>
  870 + </entry>
  871 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
  872 + <provider selected="true" editor-type-id="text-editor" />
  873 + </entry>
  874 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
  875 + <provider selected="true" editor-type-id="text-editor" />
  876 + </entry>
932 <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php"> 877 <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
933 <provider selected="true" editor-type-id="text-editor"> 878 <provider selected="true" editor-type-id="text-editor">
934 - <state relative-caret-position="336">  
935 - <caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" /> 879 + <state relative-caret-position="153">
  880 + <caret line="25" column="12" selection-start-line="25" selection-start-column="10" selection-end-line="25" selection-end-column="34" />
  881 + </state>
  882 + </provider>
  883 + </entry>
  884 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
  885 + <provider selected="true" editor-type-id="text-editor">
  886 + <state relative-caret-position="231">
  887 + <caret line="19" column="27" selection-start-line="19" selection-start-column="27" selection-end-line="19" selection-end-column="27" />
  888 + </state>
  889 + </provider>
  890 + </entry>
  891 + <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
  892 + <provider selected="true" editor-type-id="text-editor">
  893 + <state relative-caret-position="555">
  894 + <caret line="158" column="52" selection-start-line="158" selection-start-column="52" selection-end-line="158" selection-end-column="52" />
  895 + <folding>
  896 + <element signature="e#636#668#0#PHP" expanded="true" />
  897 + <element signature="e#17688#17731#0#PHP" />
  898 + <element signature="e#17688#17779#0#PHP" />
  899 + </folding>
936 </state> 900 </state>
937 </provider> 901 </provider>
938 </entry> 902 </entry>
@@ -154,9 +154,9 @@ class YuyueController extends UserBaseController @@ -154,9 +154,9 @@ class YuyueController extends UserBaseController
154 if ($res) { 154 if ($res) {
155 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find(); 155 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
156 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find(); 156 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
157 - $msg = "您好!您已成功预约:{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程,请按时上课,教练电话:{$tea_info['mobile']},如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】"; 157 + $msg = "您好!您已成功预约:{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程,请按时上课,教练电话:{$tea_info['mobile']},如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
158 $tool->get_sms_code_p($stu_info['mobile'], $msg); 158 $tool->get_sms_code_p($stu_info['mobile'], $msg);
159 - $msg1 = "您好!您的:{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约,请按时上课,学员电话:{$stu_info['mobile']}【悠乐驾】"; 159 + $msg1 = "您好!您的:{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约,请按时上课,学员电话:{$stu_info['mobile']}【悠乐驾】";
160 $tool->get_sms_code_p($tea_info['mobile'], $msg1); 160 $tool->get_sms_code_p($tea_info['mobile'], $msg1);
161 $param1 = [ 161 $param1 = [
162 'touser' => $stu_info['openid'], 162 'touser' => $stu_info['openid'],
@@ -295,9 +295,9 @@ class YuyueController extends UserBaseController @@ -295,9 +295,9 @@ class YuyueController extends UserBaseController
295 295
296 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find(); 296 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
297 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find(); 297 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
298 - $msg = "您好!您已成功预约:{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程,请按时上课,教练电话:{$tea_info['mobile']},如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】"; 298 + $msg = "您好!您已成功预约:{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程,请按时上课,教练电话:{$tea_info['mobile']},如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
299 $tool->get_sms_code_p($stu_info['mobile'], $msg); 299 $tool->get_sms_code_p($stu_info['mobile'], $msg);
300 - $msg1 = "您好!您的:{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约,请按时上课,学员电话:{$stu_info['mobile']}【悠乐驾】"; 300 + $msg1 = "您好!您的:{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约,请按时上课,学员电话:{$stu_info['mobile']}【悠乐驾】";
301 $tool->get_sms_code_p($tea_info['mobile'], $msg1); 301 $tool->get_sms_code_p($tea_info['mobile'], $msg1);
302 $param1 = [ 302 $param1 = [
303 'touser' => $stu_info['openid'], 303 'touser' => $stu_info['openid'],