外包项目 / signUpForCar · 提交

转到一个项目

作者 lianghiu
提交 c3d5045283b4ad800da97f4e93afb9d0b946f64e 2 个父辈 8107588f f3b5204d

Merge branch 'master' of http://114.215.101.231:8099/outsource/signUpForCar

内嵌 并排对比
正在显示 18 个修改的文件 包含 906 行增加 和 625 行删除
... ... @@ -3,7 +3,7 @@
<component name="ChangeListManager">
<list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/admin/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/CommentController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -17,69 +17,18 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<file leaf-file-name="SignatureHelper.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="609">
<caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" />
<folding>
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
<element signature="e#1459#2877#0#PHP" />
<element signature="e#1502#1569#0#PHP" />
<element signature="e#1717#1797#0#PHP" />
<element signature="e#1884#2341#0#PHP" />
<element signature="e#1946#2053#0#PHP" />
<element signature="e#2209#2331#0#PHP" />
<element signature="e#2902#4247#0#PHP" />
<element signature="e#3375#3420#0#PHP" />
<element signature="e#3375#3469#0#PHP" />
<element signature="e#3375#3510#0#PHP" />
<element signature="e#3375#3553#0#PHP" />
<element signature="e#3631#3704#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#6595#7177#1#PHP" />
<element signature="e#7503#8007#1#PHP" />
<element signature="e#8213#8299#0#PHP" />
<element signature="e#8355#8539#0#PHP" />
<element signature="e#8564#9616#0#PHP" />
<element signature="e#8820#8865#0#PHP" />
<element signature="e#8820#8914#0#PHP" />
<element signature="e#8820#8955#0#PHP" />
<element signature="e#8820#8998#0#PHP" />
<element signature="e#9076#9149#0#PHP" />
<element signature="e#9641#10319#0#PHP" />
<element signature="e#10344#14313#0#PHP" />
<element signature="e#10608#14305#0#PHP" />
<element signature="e#10697#14305#0#PHP" />
<element signature="e#11141#11228#0#PHP" />
<element signature="e#11376#14295#0#PHP" />
<element signature="e#12117#13054#0#PHP" />
<element signature="e#12425#13036#1#PHP" />
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
<element signature="e#14605#14746#0#PHP" />
<element signature="e#14605#14816#0#PHP" />
<element signature="e#14605#14858#0#PHP" />
<element signature="e#14605#14886#0#PHP" />
</folding>
</state>
<state relative-caret-position="-99" />
</provider>
</entry>
</file>
<file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
<file leaf-file-name="sendSms.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2520">
<caret line="168" selection-start-line="168" selection-end-line="168" />
<folding>
<element signature="e#769#1822#0#PHP" />
</folding>
<state relative-caret-position="1344">
<caret line="76" selection-start-line="76" selection-end-line="76" />
</state>
</provider>
</entry>
... ... @@ -87,128 +36,74 @@
<file leaf-file-name="BookingController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2898">
<caret line="147" selection-start-line="147" selection-end-line="147" />
<state relative-caret-position="534">
<caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="enter.html" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html">
<file leaf-file-name="student.html" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="468">
<caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index2.htm" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm">
<file leaf-file-name="RegController [2].php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2142">
<caret line="102" column="130" selection-start-line="102" selection-start-column="130" selection-end-line="102" selection-end-column="130" />
<state relative-caret-position="279">
<caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="enter_introduct.html" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_introduct.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="enter_jituanjiagou_acticle.htm" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm">
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1449">
<caret line="69" selection-start-line="69" selection-end-line="69" />
<state relative-caret-position="188">
<caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
<folding>
<element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="e#628#666#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="enter_jituanjiagou.htm" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm">
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#em#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#strong#0;n#span#0;n#em#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#3;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#p#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#strong#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#2;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#3;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#4;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#strong#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#2;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="321">
<caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="send_template.log" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log">
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2646">
<caret line="126" selection-start-line="125" selection-start-column="436" selection-end-line="126" />
<state relative-caret-position="357">
<caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.htm" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="confirm_order.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3402">
<caret line="162" column="16" selection-start-line="162" selection-start-column="16" selection-end-line="162" selection-end-column="29" />
<state relative-caret-position="357">
<caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
</state>
</provider>
</entry>
... ... @@ -255,15 +150,31 @@
<option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" />
<option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" />
<option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
<option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html" />
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/CommentController.php" />
</list>
</option>
</component>
... ... @@ -328,20 +239,62 @@
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="user" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="portal" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="portal" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
<item name="cmf" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
<item name="cmf" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
<select />
</subPane>
... ... @@ -351,12 +304,15 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../ThinkCMF" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\www\dm161xcgit\public\themes\simpleboot3\portal\index" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/api/wxapp" />
</key>
... ... @@ -389,107 +345,376 @@
<workItem from="1531747533208" duration="2488000" />
<workItem from="1531794895610" duration="20000" />
<workItem from="1535458114609" duration="13848000" />
<workItem from="1535514127808" duration="19000" />
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="20814000" />
<workItem from="1535633001243" duration="13825000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<task id="LOCAL-00010" summary="已评价无数据情况">
<created>1535465766116</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1535458170068</updated>
<updated>1535465766116</updated>
</task>
<task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">
<created>1535458750848</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<task id="LOCAL-00011" summary="已评价无数据情况">
<created>1535465827689</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1535458750848</updated>
<updated>1535465827689</updated>
</task>
<task id="LOCAL-00003" summary="已经成功报名的用户，不能再次报名 放在确认订单页面">
<created>1535459632689</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<task id="LOCAL-00012" summary="已评价无数据情况">
<created>1535514168713</created>
<option name="number" value="00012" />
<option name="presentableId" value="LOCAL-00012" />
<option name="project" value="LOCAL" />
<updated>1535459632689</updated>
<updated>1535514168713</updated>
</task>
<task id="LOCAL-00004" summary="已评价无数据情况">
<created>1535460444090</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<task id="LOCAL-00013" summary="已评价无数据情况">
<created>1535533488753</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1535460444090</updated>
<updated>1535533488753</updated>
</task>
<task id="LOCAL-00005" summary="已评价无数据情况">
<created>1535461932931</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<task id="LOCAL-00014" summary="取消预约短信">
<created>1535534252730</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1535461932931</updated>
<updated>1535534252730</updated>
</task>
<task id="LOCAL-00006" summary="已评价无数据情况">
<created>1535462141136</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<task id="LOCAL-00015" summary="ceshi wode jiaolian">
<created>1535546534569</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1535462141136</updated>
<updated>1535546534569</updated>
</task>
<task id="LOCAL-00007" summary="已评价无数据情况">
<created>1535462428440</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<task id="LOCAL-00016" summary="ceshi wode jiaolian">
<created>1535546965523</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1535462428440</updated>
<updated>1535546965523</updated>
</task>
<task id="LOCAL-00008" summary="已评价无数据情况">
<created>1535462581974</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<task id="LOCAL-00017" summary="ceshi wode jiaolian">
<created>1535547118071</created>
<option name="number" value="00017" />
<option name="presentableId" value="LOCAL-00017" />
<option name="project" value="LOCAL" />
<updated>1535462581974</updated>
<updated>1535547118071</updated>
</task>
<task id="LOCAL-00009" summary="已评价无数据情况">
<created>1535465324978</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<task id="LOCAL-00018" summary="ceshi wode jiaolian">
<created>1535548842017</created>
<option name="number" value="00018" />
<option name="presentableId" value="LOCAL-00018" />
<option name="project" value="LOCAL" />
<updated>1535465324978</updated>
<updated>1535548842017</updated>
</task>
<task id="LOCAL-00010" summary="已评价无数据情况">
<created>1535465766116</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<task id="LOCAL-00019" summary="测试获取当前时段的老师">
<created>1535559377550</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1535465766116</updated>
<updated>1535559377550</updated>
</task>
<task id="LOCAL-00011" summary="已评价无数据情况">
<created>1535465827689</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<task id="LOCAL-00020" summary="测试获取当前时段的老师">
<created>1535559508443</created>
<option name="number" value="00020" />
<option name="presentableId" value="LOCAL-00020" />
<option name="project" value="LOCAL" />
<updated>1535465827689</updated>
<updated>1535559508443</updated>
</task>
<task id="LOCAL-00021" summary="测试获取当前时段的老师">
<created>1535559794285</created>
<option name="number" value="00021" />
<option name="presentableId" value="LOCAL-00021" />
<option name="project" value="LOCAL" />
<updated>1535559794285</updated>
</task>
<task id="LOCAL-00022" summary="测试获取当前时段的老师">
<created>1535559978125</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1535559978125</updated>
</task>
<task id="LOCAL-00023" summary="测试获取当前时段的老师">
<created>1535560263207</created>
<option name="number" value="00023" />
<option name="presentableId" value="LOCAL-00023" />
<option name="project" value="LOCAL" />
<updated>1535560263207</updated>
</task>
<task id="LOCAL-00024" summary="测试获取当前时段的老师">
<created>1535560747816</created>
<option name="number" value="00024" />
<option name="presentableId" value="LOCAL-00024" />
<option name="project" value="LOCAL" />
<updated>1535560747819</updated>
</task>
<task id="LOCAL-00025" summary="测试获取当前时段的老师">
<created>1535560861762</created>
<option name="number" value="00025" />
<option name="presentableId" value="LOCAL-00025" />
<option name="project" value="LOCAL" />
<updated>1535560861762</updated>
</task>
<task id="LOCAL-00026" summary="测试获取当前时段的老师">
<created>1535561095876</created>
<option name="number" value="00026" />
<option name="presentableId" value="LOCAL-00026" />
<option name="project" value="LOCAL" />
<updated>1535561095876</updated>
</task>
<task id="LOCAL-00027" summary="我的订单详情标题">
<created>1535600080734</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1535600080734</updated>
</task>
<task id="LOCAL-00028" summary="我的订单详情标题">
<created>1535633219778</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1535633219778</updated>
</task>
<task id="LOCAL-00029" summary="我的订单详情标题">
<created>1535633983516</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1535633983516</updated>
</task>
<task id="LOCAL-00030" summary="我的订单详情标题">
<created>1535634119952</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1535634119952</updated>
</task>
<task id="LOCAL-00031" summary="我的订单详情标题">
<created>1535634366456</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1535634366456</updated>
</task>
<task id="LOCAL-00032" summary="我的订单详情标题">
<created>1535634457149</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1535634457149</updated>
</task>
<task id="LOCAL-00033" summary="我的订单详情标题">
<created>1535634619847</created>
<option name="number" value="00033" />
<option name="presentableId" value="LOCAL-00033" />
<option name="project" value="LOCAL" />
<updated>1535634619847</updated>
</task>
<task id="LOCAL-00034" summary="登录处理">
<created>1535635187586</created>
<option name="number" value="00034" />
<option name="presentableId" value="LOCAL-00034" />
<option name="project" value="LOCAL" />
<updated>1535635187586</updated>
</task>
<task id="LOCAL-00035" summary="登录处理">
<created>1535635277832</created>
<option name="number" value="00035" />
<option name="presentableId" value="LOCAL-00035" />
<option name="project" value="LOCAL" />
<updated>1535635277832</updated>
</task>
<task id="LOCAL-00036" summary="登录处理">
<created>1535636528548</created>
<option name="number" value="00036" />
<option name="presentableId" value="LOCAL-00036" />
<option name="project" value="LOCAL" />
<updated>1535636528548</updated>
</task>
<task id="LOCAL-00037" summary="登录处理">
<created>1535636670545</created>
<option name="number" value="00037" />
<option name="presentableId" value="LOCAL-00037" />
<option name="project" value="LOCAL" />
<updated>1535636670545</updated>
</task>
<task id="LOCAL-00038" summary="登录处理">
<created>1535636892256</created>
<option name="number" value="00038" />
<option name="presentableId" value="LOCAL-00038" />
<option name="project" value="LOCAL" />
<updated>1535636892256</updated>
</task>
<task id="LOCAL-00039" summary="登录处理">
<created>1535636993426</created>
<option name="number" value="00039" />
<option name="presentableId" value="LOCAL-00039" />
<option name="project" value="LOCAL" />
<updated>1535636993426</updated>
</task>
<task id="LOCAL-00040" summary="登录处理">
<created>1535637256089</created>
<option name="number" value="00040" />
<option name="presentableId" value="LOCAL-00040" />
<option name="project" value="LOCAL" />
<updated>1535637256089</updated>
</task>
<task id="LOCAL-00041" summary="登录处理">
<created>1535637470734</created>
<option name="number" value="00041" />
<option name="presentableId" value="LOCAL-00041" />
<option name="project" value="LOCAL" />
<updated>1535637470734</updated>
</task>
<task id="LOCAL-00042" summary="登录处理">
<created>1535637704890</created>
<option name="number" value="00042" />
<option name="presentableId" value="LOCAL-00042" />
<option name="project" value="LOCAL" />
<updated>1535637704890</updated>
</task>
<task id="LOCAL-00043" summary="登录处理">
<created>1535637833495</created>
<option name="number" value="00043" />
<option name="presentableId" value="LOCAL-00043" />
<option name="project" value="LOCAL" />
<updated>1535637833495</updated>
</task>
<task id="LOCAL-00044" summary="登录处理">
<created>1535638014265</created>
<option name="number" value="00044" />
<option name="presentableId" value="LOCAL-00044" />
<option name="project" value="LOCAL" />
<updated>1535638014265</updated>
</task>
<task id="LOCAL-00045" summary="登录处理">
<created>1535638593262</created>
<option name="number" value="00045" />
<option name="presentableId" value="LOCAL-00045" />
<option name="project" value="LOCAL" />
<updated>1535638593262</updated>
</task>
<task id="LOCAL-00046" summary="登录处理">
<created>1535638797137</created>
<option name="number" value="00046" />
<option name="presentableId" value="LOCAL-00046" />
<option name="project" value="LOCAL" />
<updated>1535638797137</updated>
</task>
<task id="LOCAL-00047" summary="登录处理">
<created>1535639135284</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1535639135284</updated>
</task>
<task id="LOCAL-00048" summary="登录处理">
<created>1535640236039</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1535640236039</updated>
</task>
<task id="LOCAL-00049" summary="登录处理">
<created>1535645567208</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1535645567208</updated>
</task>
<task id="LOCAL-00050" summary="登录处理">
<created>1535646952275</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1535646952275</updated>
</task>
<task id="LOCAL-00051" summary="登录处理">
<created>1535647131693</created>
<option name="number" value="00051" />
<option name="presentableId" value="LOCAL-00051" />
<option name="project" value="LOCAL" />
<updated>1535647131693</updated>
</task>
<task id="LOCAL-00052" summary="登录处理">
<created>1535647189771</created>
<option name="number" value="00052" />
<option name="presentableId" value="LOCAL-00052" />
<option name="project" value="LOCAL" />
<updated>1535647189771</updated>
</task>
<task id="LOCAL-00053" summary="登录处理">
<created>1535647275205</created>
<option name="number" value="00053" />
<option name="presentableId" value="LOCAL-00053" />
<option name="project" value="LOCAL" />
<updated>1535647275205</updated>
</task>
<task id="LOCAL-00054" summary="登录处理">
<created>1535647314219</created>
<option name="number" value="00054" />
<option name="presentableId" value="LOCAL-00054" />
<option name="project" value="LOCAL" />
<updated>1535647314219</updated>
</task>
<task id="LOCAL-00055" summary="登录处理">
<created>1535649389001</created>
<option name="number" value="00055" />
<option name="presentableId" value="LOCAL-00055" />
<option name="project" value="LOCAL" />
<updated>1535649389001</updated>
</task>
<task id="LOCAL-00056" summary="登录处理">
<created>1535649825078</created>
<option name="number" value="00056" />
<option name="presentableId" value="LOCAL-00056" />
<option name="project" value="LOCAL" />
<updated>1535649825078</updated>
</task>
<task id="LOCAL-00057" summary="登录处理">
<created>1535649911424</created>
<option name="number" value="00057" />
<option name="presentableId" value="LOCAL-00057" />
<option name="project" value="LOCAL" />
<updated>1535649911425</updated>
</task>
<task id="LOCAL-00058" summary="登录处理">
<created>1535650097321</created>
<option name="number" value="00058" />
<option name="presentableId" value="LOCAL-00058" />
<option name="project" value="LOCAL" />
<updated>1535650097321</updated>
</task>
<option name="localTasksCounter" value="12" />
<option name="localTasksCounter" value="59" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="30403000" />
<option name="totallyTimeSpent" value="68277000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14179105" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Version Control" order="7" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="Terminal" order="7" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info id="npm" order="2" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
... ... @@ -499,6 +724,28 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
</layout>
<layout-to-restore>
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="npm" order="2" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Terminal" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info id="Favorites" order="3" side_tool="true" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
... ... @@ -511,381 +758,335 @@
<MESSAGE value="修复教练的时间段可以重复预约" />
<MESSAGE value="已经成功报名的用户，不能再次报名 放在确认订单页面" />
<MESSAGE value="已评价无数据情况" />
<option name="LAST_COMMIT_MESSAGE" value="已评价无数据情况" />
<MESSAGE value="取消预约短信" />
<MESSAGE value="ceshi wode jiaolian" />
<MESSAGE value="测试获取当前时段的老师" />
<MESSAGE value="我的订单详情标题" />
<MESSAGE value="登录处理" />
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/portal/route.php">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/tags.php">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/controller/v1/Token.php" />
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30093">
<caret line="1448" column="29" selection-start-line="1448" selection-start-column="29" selection-end-line="1448" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/portal/validate/ArticlesValidate.php">
<provider selected="true" editor-type-id="text-editor" />
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/portal/controller/UserController.php">
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-21" />
<state relative-caret-position="1365">
<caret line="74" column="32" selection-start-line="74" selection-start-column="32" selection-end-line="74" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/conf/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/api/index.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/add.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/home/controller/SlidesController.php">
<entry file="file://$PROJECT_DIR$/public/static/css/viyagerapp.css" />
<entry file="file://$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-293" />
<state relative-caret-position="1113">
<caret line="53" column="2" selection-start-line="53" selection-start-column="2" selection-end-line="53" selection-end-column="2" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/common/exception/Http.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-98" />
<state relative-caret-position="693">
<caret line="33" selection-start-line="33" selection-end-line="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/common/model/CommonModel.php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/PublicController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-974" />
<state relative-caret-position="966">
<caret line="55" column="5" selection-start-line="55" selection-start-column="5" selection-end-line="55" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" />
<state relative-caret-position="819">
<caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/home/controller/RestController.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_introduct.html" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-280" />
<state relative-caret-position="147">
<caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/home/route.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="76">
<caret line="4" column="18" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="28" />
<state relative-caret-position="405">
<caret line="529" column="42" selection-start-line="529" selection-start-column="38" selection-end-line="529" selection-end-column="42" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/route.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/release.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/debug.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/database.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/command.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="18" selection-start-line="18" selection-end-line="18" />
<state relative-caret-position="3108">
<caret line="158" column="18" lean-forward="true" selection-start-line="158" selection-start-column="18" selection-end-line="158" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/route.php" />
<entry file="file://$PROJECT_DIR$/api/config.php">
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448">
<caret line="262" column="28" selection-start-line="262" selection-start-column="28" selection-end-line="262" selection-end-column="28" />
<state relative-caret-position="420">
<caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/service/UserToken.php" />
<entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/route.php" />
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="20" column="24" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="24" />
<state relative-caret-position="630">
<caret line="38" column="36" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/controller/CommentsController.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="18" column="51" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="51" />
<state relative-caret-position="7602">
<caret line="362" column="14" selection-start-line="362" selection-start-column="14" selection-end-line="373" selection-end-column="31" />
<folding>
<element signature="n#style#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#4;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/model/UserModel.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
<state relative-caret-position="3864">
<caret line="184" column="28" selection-start-line="184" selection-start-column="28" selection-end-line="184" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/model/UserFavoriteModel.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1827">
<caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
<state relative-caret-position="1932">
<caret line="797" column="85" selection-start-line="797" selection-start-column="85" selection-end-line="797" selection-end-column="85" />
<folding>
<element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
<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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/route.php">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/my_order.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="22" />
<state relative-caret-position="315">
<caret line="15" column="48" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="48" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
<state relative-caret-position="420">
<caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/controller/v1/Token.php" />
<entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30093">
<caret line="1448" column="29" selection-start-line="1448" selection-start-column="29" selection-end-line="1448" selection-end-column="29" />
<state relative-caret-position="420">
<caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
<state relative-caret-position="660">
<caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#17688#17731#0#PHP" />
<element signature="e#17688#17779#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
<entry file="file://$PROJECT_DIR$/public/index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1365">
<caret line="74" column="32" selection-start-line="74" selection-start-column="32" selection-end-line="74" selection-end-column="32" />
<state relative-caret-position="126">
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/data/conf/database.php">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
<state relative-caret-position="420">
<caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/add.html">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/static/css/viyagerapp.css" />
<entry file="file://$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1113">
<caret line="53" column="2" selection-start-line="53" selection-start-column="2" selection-end-line="53" selection-end-column="2" />
<state relative-caret-position="549">
<caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="693">
<caret line="33" selection-start-line="33" selection-end-line="33" />
</state>
<state relative-caret-position="-99" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/PublicController.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="966">
<caret line="55" column="5" selection-start-line="55" selection-start-column="5" selection-end-line="55" selection-end-column="5" />
<state relative-caret-position="1344">
<caret line="76" selection-start-line="76" selection-end-line="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="819">
<caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
<state relative-caret-position="2440">
<caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" />
<folding>
<element signature="e#2713#3721#0#PHP" />
<element signature="e#5505#6819#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="336">
<caret line="66" column="46" selection-start-line="66" selection-start-column="46" selection-end-line="66" selection-end-column="46" />
<state relative-caret-position="126">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1701" />
<state relative-caret-position="468">
<caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2898">
<caret line="147" selection-start-line="147" selection-end-line="147" />
<state relative-caret-position="273">
<caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3402">
<caret line="162" column="16" selection-start-line="162" selection-start-column="16" selection-end-line="162" selection-end-column="29" />
<state relative-caret-position="534">
<caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="525">
<caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="567">
<caret line="214" column="50" lean-forward="true" selection-start-line="214" selection-start-column="50" selection-end-line="214" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2142">
<caret line="102" column="130" selection-start-line="102" selection-start-column="130" selection-end-line="102" selection-end-column="130" />
<state relative-caret-position="279">
<caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2646">
<caret line="126" selection-start-line="125" selection-start-column="436" selection-end-line="126" />
<state relative-caret-position="357">
<caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2520">
<caret line="168" selection-start-line="168" selection-end-line="168" />
<state relative-caret-position="188">
<caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
<folding>
<element signature="e#769#1822#0#PHP" />
<element signature="e#628#666#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1449">
<caret line="69" selection-start-line="69" selection-end-line="69" />
<folding>
<element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="273">
<caret line="21" selection-start-line="21" selection-end-line="21" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_introduct.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm">
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="447">
<caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#em#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#strong#0;n#span#0;n#em#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#3;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#p#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#strong#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#2;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#span#0;n#p#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#2;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#3;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#4;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#img#0;n#p#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#strong#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#2;n#section#1;n#section#0;n#section#0;n#section#0;n#section#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#0;n#section#0;n#section#0;n#section#0;n#section#1;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#p#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#p#2;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="321">
<caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="609">
<caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" />
<folding>
<element signature="e#911#990#0#PHP" />
<element signature="e#1015#1432#0#PHP" />
<element signature="e#1459#2877#0#PHP" />
<element signature="e#1502#1569#0#PHP" />
<element signature="e#1717#1797#0#PHP" />
<element signature="e#1884#2341#0#PHP" />
<element signature="e#1946#2053#0#PHP" />
<element signature="e#2209#2331#0#PHP" />
<element signature="e#2902#4247#0#PHP" />
<element signature="e#3375#3420#0#PHP" />
<element signature="e#3375#3469#0#PHP" />
<element signature="e#3375#3510#0#PHP" />
<element signature="e#3375#3553#0#PHP" />
<element signature="e#3631#3704#0#PHP" />
<element signature="e#4913#5015#0#PHP" />
<element signature="e#5338#5425#0#PHP" />
<element signature="e#6595#7177#1#PHP" />
<element signature="e#7503#8007#1#PHP" />
<element signature="e#8213#8299#0#PHP" />
<element signature="e#8355#8539#0#PHP" />
<element signature="e#8564#9616#0#PHP" />
<element signature="e#8820#8865#0#PHP" />
<element signature="e#8820#8914#0#PHP" />
<element signature="e#8820#8955#0#PHP" />
<element signature="e#8820#8998#0#PHP" />
<element signature="e#9076#9149#0#PHP" />
<element signature="e#9641#10319#0#PHP" />
<element signature="e#10344#14313#0#PHP" />
<element signature="e#10608#14305#0#PHP" />
<element signature="e#10697#14305#0#PHP" />
<element signature="e#11141#11228#0#PHP" />
<element signature="e#11376#14295#0#PHP" />
<element signature="e#12117#13054#0#PHP" />
<element signature="e#12425#13036#1#PHP" />
<element signature="e#13082#14019#0#PHP" />
<element signature="e#13390#14001#1#PHP" />
<element signature="e#14209#14295#0#PHP" />
<element signature="e#14492#14586#0#PHP" />
<element signature="e#14605#14647#0#PHP" />
<element signature="e#14605#14697#0#PHP" />
<element signature="e#14605#14746#0#PHP" />
<element signature="e#14605#14816#0#PHP" />
<element signature="e#14605#14858#0#PHP" />
<element signature="e#14605#14886#0#PHP" />
</folding>
<state relative-caret-position="357">
<caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
</state>
</provider>
</entry>
... ...
... ... @@ -192,6 +192,7 @@ class BookingController extends AdminBaseController
}
$where['yy.create_time'] = array('gt',0);
$where['yy.uid'] = array('gt',0);
$list = DB::name('yuyue')
->alias('yy')
->join('qnb_user u','u.id=yy.teach_id')
... ...
... ... @@ -133,7 +133,7 @@ class CommentController extends AdminBaseController
if (!empty($mobile)) {
$where['mobile'] = $mobile;
}
$where['delete_time'] = 0;
$where['c.delete_time'] = 0;
$list = DB::name($this->table_name)
->alias('c')
->join('qnb_user u','u.id=c.teach_id')
... ... @@ -175,7 +175,7 @@ class CommentController extends AdminBaseController
->alias('c')
->join('qnb_user u','u.id=c.uid')
->field('c.*')
->where(['delete_time'=>0])
->where(['c.delete_time'=>0])
->paginate(15);
$this->assign("list", $list->items());
... ...
... ... @@ -80,6 +80,7 @@ class UserController extends AdminBaseController
{
/**查询条件**/
$where = ["user_type" => 2];
$where = ["student_type" => 1];
/**搜索条件**/
$user_nickname = $this->request->param('user_nickname');
$mobile = trim($this->request->param('mobile'));
... ...
... ... @@ -110,12 +110,12 @@ class IndexController extends HomeBaseController
->find();
if ($re) {
$dataup['id'] = $re['id'];
session('user.id', $dataup['id']);
session('pay_uid', $dataup['id']);
$res = Db::name('user')->update($dataup);
if ($res) {
return json(['code' => '1', 'msg' => '保存成功']);
} else {
return json(['code' => '0', 'msg' => '保存失败']);
return json(['code' => '1', 'msg' => '报名信息更新成功']);
}
} else {
return json(['code' => '0', 'msg' => '保存失败']);
... ... @@ -129,7 +129,7 @@ class IndexController extends HomeBaseController
{
$gid = $req->param('gid');
$id = session('user.id');
$id = session('pay_uid');
$re = Db::name('user')->where(['id' => $id])->find();
$res = Db::name('goods')->where(['id' => $gid])->find();
... ... @@ -146,7 +146,7 @@ class IndexController extends HomeBaseController
$gid = $req->param('gid');
$res = Db::name('goods')->where(['id' => $gid])->find();
$id = session('user.id');
$id = session('pay_uid');
$data['gid'] = $gid;
$data['uid'] = $id;
$data['create_time'] = time();
... ... @@ -160,6 +160,13 @@ class IndexController extends HomeBaseController
}
}
//支付成功 ajax
public function pay_success()
{
return $this->fetch();
}
//学员手册
public function student_shouce()
... ...
... ... @@ -17,6 +17,28 @@ use think\Db;
class ToolController extends HomeBaseController
{
public function isMixTime($begintime1,$endtime1,$begintime2,$endtime2)
{
$status = $begintime2 - $begintime1;
if($status>0){
$status2 = $begintime2 - $endtime1;
if($status2>=0){
return false;
}else{
return true;
}
}else{
$status2 = $begintime1 - $endtime2;
if($status2>=0){
return false;
}else{
return true;
}
}
}
public function get_relax_time()
{
$day = $this->request->param('day');
... ... @@ -31,7 +53,6 @@ class ToolController extends HomeBaseController
for($t = 6;$t<=18;$t++){
$all_arr[]=$t;
}
$arr = [];
for($i = 0;$i<count($res);$i++){
$begin = $res[$i]["yuyue_begin"];
... ... @@ -48,7 +69,6 @@ class ToolController extends HomeBaseController
$ok_arr[] = "yes";
}
}
if ($ok_arr){
return json(['code'=>'1','msg'=>'获取成功','data'=>json_encode($ok_arr,true)]);
}else{
... ...
... ... @@ -25,10 +25,19 @@ class LoginController extends HomeBaseController
{
//session('user.id','10');
$ress = Db::name('user')->where(['openid'=>session('openid')])->find();
if($ress && $ress['mobile'] != ''){
if($ress && $ress['mobile'] != '' ){
//已支付学员
if($ress['user_type'] == '2'){
if($ress['student_type'] == '1' and $ress['delete_time'] == '0'){
session('user.id',$ress['id']);
return redirect($this->request->root() . '/user/profile/percenter');
}
}else{
session('user.id',$ress['id']);
return redirect($this->request->root() . '/user/profile/percenter');
}
}
$redirect = $this->request->post("redirect");
if (empty($redirect)) {
... ... @@ -74,6 +83,12 @@ class LoginController extends HomeBaseController
$res = Db::name('user')->where(['mobile'=>$mobile])->find();
if($res){
//学员未支付 学员被删除 不可以登录
if (($res['user_type'] == '2' and $res['student_type'] != '1') or $res['delete_time'] != '0'){
return json(['code'=>'0','msg'=>'抱歉，此用户没有权限登录']);
}
//后台添加用户，微信登陆后合并数据
if($res['add_type'] == '2'){
$op_tel_info = Db::name('user')->where(['openid'=>session('openid'),'mobile'=>$mobile])->find();
... ... @@ -89,11 +104,6 @@ class LoginController extends HomeBaseController
}
}
//学员成功支付后才可以登陆
}elseif ($res['user_type'] == '2' and $res['student_type'] == '2'){
return json(['code'=>'0','msg'=>'抱歉，此用户没有权限登录']);
//用户被拉黑
}elseif($res['user_status'] != '1'){
return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);
}
session('user.id',$res['id']);
return json(['code'=>'1','msg'=>'登陆成功']);
... ...
... ... @@ -17,7 +17,6 @@ use think\Db;
use think\Request;
use app\portal\controller\ToolController as tool;
class YuyueController extends UserBaseController
{
... ... @@ -45,8 +44,9 @@ class YuyueController extends UserBaseController
}
//step3：选择响应时间教练
public function coach_list()
public function coach_list(tool $tool)
{
if (!session('yuyue_pre.day')) {
echo '非法请求';
}
... ... @@ -61,20 +61,12 @@ class YuyueController extends UserBaseController
//获取当前时段已被预约的教练
$ex = '';
foreach ($rr as $v) {
$day_find = [];
for ($i = $v['yuyue_begin']; $i <= $v['yuyue_end']; $i++) {
$day_find[] = $i;
}
$f1 = array_search($bbegin, $day_find);
$f2 = array_search($eend, $day_find);
$ac = count($day_find) - 1;
$res = $tool->isMixTime($bbegin,$eend,$v['yuyue_begin'],$v['yuyue_end']);
$res && $ex .= $v['teach_id'] . ',';
if (($f2 && $f2 > '0') || ($f1 && $f1 < $ac) || ($f1 && $f2)) {
$ex .= $v['teach_id'] . ',';
}
}
//获取当前时段有时间的教练
$where['user_type'] = 3;
$where['id'] = array('not in', $ex);
... ... @@ -162,9 +154,9 @@ class YuyueController extends UserBaseController
if ($res) {
$stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
$tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
$msg = "您好！您已成功预约：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$msg = "您好！您已成功预约：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$tool->get_sms_code_p($stu_info['mobile'], $msg);
$msg1 = "您好！您的：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$msg1 = "您好！您的：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$tool->get_sms_code_p($tea_info['mobile'], $msg1);
$param1 = [
'touser' => $stu_info['openid'],
... ... @@ -190,7 +182,8 @@ class YuyueController extends UserBaseController
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => $stu_info['mobile']),
'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword4' => array('value' => "点击查看预约并确认预约")
'keyword4' => array('value' => $tea_info['user_nickname']),
'remark' => array('value' => "点击查看预约并确认预约")
)
];
... ... @@ -302,36 +295,36 @@ class YuyueController extends UserBaseController
$stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
$tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
$msg = "您好！您已成功预约：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$msg = "您好！您已成功预约：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
$tool->get_sms_code_p($stu_info['mobile'], $msg);
$msg1 = "您好！您的：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$msg1 = "您好！您的：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
$tool->get_sms_code_p($tea_info['mobile'], $msg1);
$param1 = [
'touser' => $stu_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo',
'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
'data' => array(
'first' => array('value' => '学车预约通知'),
'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),
'keyword3' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),
'keyword4' => array('value' => $tea_info['mobile']),
'keyword5' => array('value' => '无', 'color' => '#0099FF')
'first' => array('value' => '您的预约成功啦'),
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => $stu_info['mobile']),
'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword4' => array('value' => $tea_info['user_nickname']),
'remark' => array('value' => "点击查看预约")
)
];
$param2 = [
'touser' => $tea_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo',
'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
'data' => array(
'first' => array('value' => '学车预约通知'),
'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),
'keyword3' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword4' => array('value' => $stu_info['mobile']),
'keyword5' => array('value' => '无', 'color' => '#0099FF')
'first' => array('value' => '有新的学员预约啦'),
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => $stu_info['mobile']),
'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'keyword4' => array('value' => $tea_info['user_nickname']),
'remark' => array('value' => "点击查看预约并确认预约")
)
];
... ... @@ -436,55 +429,46 @@ class YuyueController extends UserBaseController
$data = Db::name('yuyue')
->alias('yy')
->join('qnb_user u', 'u.id=yy.uid')
->join('order o', 'o.uid=yy.uid')
->join('goods g', 'g.id=o.gid')
->where(['teach_id' => $id])
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname')
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
->order('create_time desc')
->select()
->toArray();
$data1 = Db::name('yuyue')
->alias('yy')
->join('qnb_user u', 'u.id=yy.uid')
->join('order o', 'o.uid=yy.uid')
->join('goods g', 'g.id=o.gid')
->where(['teach_id' => $id])
->where(['yy.status' => '1'])
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname')
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
->order('create_time desc')
->select()
->toArray();
$data2 = Db::name('yuyue')
->alias('yy')
->join('qnb_user u', 'u.id=yy.uid')
->join('order o', 'o.uid=yy.uid')
->join('goods g', 'g.id=o.gid')
->where(['teach_id' => $id])
->where(['yy.status' => '4'])
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname')
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
->order('create_time desc')
->select()
->toArray();
$data3 = Db::name('yuyue')
->alias('yy')
->join('qnb_user u', 'u.id=yy.uid')
->join('order o', 'o.uid=yy.uid')
->join('goods g', 'g.id=o.gid')
->where(['teach_id' => $id])
->where(['yy.status' => '2'])
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname')
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
->order('create_time desc')
->select()
->toArray();
$data4 = Db::name('yuyue')
->alias('yy')
->join('qnb_user u', 'u.id=yy.uid')
->join('order o', 'o.uid=yy.uid')
->join('goods g', 'g.id=o.gid')
->where(['teach_id' => $id])
->where(['yy.status' => '3'])
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname')
->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
->order('create_time desc')
->select()
->toArray();
... ... @@ -521,11 +505,42 @@ class YuyueController extends UserBaseController
if ($rres) {
$stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
$tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
$msg = "您好！您已成功取消：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】";
$msg = "您好！您已成功取消：{$data['yuyue_day']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】";
$tool->get_sms_code_p($stu_info['mobile'], $msg);
$msg1 = "您好！您的：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。
$msg1 = "您好！您的：{$data['yuyue_day']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。
【悠乐驾】";
$tool->get_sms_code_p($tea_info['mobile'], $msg1);
$param1 = [
'touser' => $stu_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
'data' => array(
'first' => array('value' => '您的预约已取消'),
'keyword1' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'remark' => array('value' => "谢谢使用")
)
];
$param2 = [
'touser' => $tea_info['openid'],
'topcolor' => '#7B68EE',
'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
'data' => array(
'first' => array('value' => '您的预约已取消'),
'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
'remark' => array('value' => "谢谢使用")
)
];
$res = $tool->wxtemsg_send($param1);
$res = $tool->wxtemsg_send($param2);
return json(['code' => '1', 'msg' => '删除成功']);
} else {
return json(['code' => '0', 'msg' => '抱歉，删除失败']);
... ...
... ... @@ -10,7 +10,7 @@
// [ 入口文件 ]
date_default_timezone_set('Asia/Shanghai');
// 调试模式开关
define("APP_DEBUG", false);
define("APP_DEBUG", 1);
// 定义CMF根目录,可更改此目录
define('CMF_ROOT', __DIR__ . '/../');
... ...
... ... @@ -82,7 +82,7 @@ try {
WeixinJSBridge.log(res.err_msg);
//alert(res.err_code);
if (res.err_msg == 'get_brand_wcpay_request:ok') {
window.location.href = 'http://wx.youlj.cn/user/order/pay_success.html';
window.location.href = 'http://wx.youlj.cn/portal/index/pay_success.html';
} else if (res.err_msg == 'get_brand_wcpay_request:cancel') {
window.history.go(-1);
}
... ...
... ... @@ -48,8 +48,8 @@
<td><b>{$vo.id}</b></td>
<td>{$vo.user_nickname}</td>
<td>{$vo.uid|id_name}</td>
<td>{$vo.yuyue_day1}</td>
<td>{$vo.yuyue_hour1}</td>
<td>{$vo.yuyue_day}</td>
<td>{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</td>
<td>
<notempty name="vo.create_time">
{:date('Y-m-d H:i',$vo['create_time'])}
... ...
... ... @@ -36,7 +36,7 @@
</li>
<li>
<b>年龄</b>
<i>{$data.birthday|birthday_name}</i>
<i>{$data.birthday}</i>
</li>
<li>
<b>身份证</b>
... ...
... ... @@ -12,8 +12,18 @@
<link rel="stylesheet" href="/static/css/style.css">
<style>
.title_bm {
margin-top: 15.1vh;
font-size: .36rem;
position: fixed;
top: 4.5%;
left: 0;
width: 100%;
}
.bm_list {
margin-top: 5.5rem;
}
.title_bm p {
text-align: center;
}
</style>
</head>
... ...
... ... @@ -244,10 +244,9 @@
},
success: function (data) {
if (data.code == '1') {
// alert("成功");
window.location.href = "{:url('portal/index/confirm_order',['gid'=>$gid])}";
} else {
alert(data.msg);
layer.msg(data.msg);
}
}
})
... ...
... ... @@ -5,7 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="yes" name="apple-mobile-web-app-capable">
<meta content="yes" name="apple-touch-fullscreen">
<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="viewport"
content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
<title>登录</title>
<link rel="stylesheet" href="/static/css/common.css">
<link rel="stylesheet" href="/static/css/style.css">
... ... @@ -27,7 +28,7 @@
<i>抱歉，此手机号没有权限登录</i>
</div>
<div class="btn_login">
<img src="/static/image/btn_login.png" />
<img src="/static/image/btn_login.png"/>
</div>
</div>
... ... @@ -38,72 +39,65 @@
<script>
$(function () {
//获取短信验证码
var times = 1;
var validCode=true;
$(".get_code").click (function () {
if(validCode){
var user_phone=$(".login_phone").val();
console.log(user_phone);
if(!user_phone){
var validCode = true;
$(".get_code").click(function () {
if (validCode) {
var user_phone = $(".login_phone").val();
if (!user_phone) {
layer.msg("手机号码格式不正确")
}else{
if(times ==1){
times++;
} else {
$.ajax({
type:"post",
url:"{:url('portal/tool/get_sms_code')}",
data:{
mobile:user_phone
type: "post",
url: "{:url('portal/tool/get_sms_code')}",
data: {
mobile: user_phone
},
success:function(){
var time=60;
var code=$(".get_code");
success: function () {
var time = 60;
var code = $(".get_code");
if (validCode) {
code.html("60秒");
validCode=false;
validCode = false;
code.addClass("msgs1");
var t=setInterval(function () {
if (time>=0) {
var t = setInterval(function () {
if (time > 0) {
time--;
code.html(time+"秒");
validCode=false;
} else{
validCode =true;
code.html(time + "秒");
validCode = false;
} else {
code.html("重新获取");
clearInterval(t);
validCode = true;
}
},1000)
}, 1000)
}
}
})
}
}
}
});
$('.btn_login').click(function(){
var user_phone=$(".login_phone").val();
var user_code=$('.login_code').val();
if(!user_code){
$('.btn_login').click(function () {
var user_phone = $(".login_phone").val();
var user_code = $('.login_code').val();
if (!user_code) {
layer.msg("验证码不能为空")
}else{
} else {
$.ajax({
type:"post",
url:"{:url('user/login/do_login')}",
data:{
mobile:user_phone,
sms_code:user_code
type: "post",
url: "{:url('user/login/do_login')}",
data: {
mobile: user_phone,
sms_code: user_code
},
success:function(res){
if(res.code==0){
$('.login_tab i').text(res.msg);
$('.login_tab').show();
}else {
window.location.href="{:url('user/profile/percenter')}"
success: function (res) {
if (res.code == 0) {
layer.msg(res.msg);
} else {
window.location.href = "{:url('user/profile/percenter')}"
}
console.log(res);
},
error:function(){
error: function () {
}
})
... ...
... ... @@ -6,7 +6,7 @@
<meta content="yes" name="apple-mobile-web-app-capable">
<meta content="yes" name="apple-touch-fullscreen">
<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
<title>手动挡C1学车</title>
<title>{$data.name}</title>
<link rel="stylesheet" href="/static/css/common.css">
<link rel="stylesheet" href="/static/css/style.css">
</head>
... ...
... ... @@ -5,7 +5,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta content="yes" name="apple-mobile-web-app-capable">
<meta content="yes" name="apple-touch-fullscreen">
<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
<meta name="viewport"
content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
<title>我的预约</title>
<link rel="stylesheet" href="/static/css/common.css">
<link rel="stylesheet" href="/static/css/style.css">
... ... @@ -43,9 +44,9 @@
<div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
<img src="/static/image/btn_yuyue.png">
</div>
<else />
<else/>
<volist name="data" id="vo">
<div class="yuyueList" >
<div class="yuyueList">
<div class="yList_top">
<b>{$vo.status|yuyue_status_name}</b>
<i>{$vo.yuyue_day|date_to_date}</i>
... ... @@ -73,16 +74,19 @@
</div>
</case>
<case value="2">
<div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>$vo['teach_id'],'yuyue_id'=>$vo['id']))}">
<div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>
$vo['teach_id'],'yuyue_id'=>$vo['id']))}">
<b class="click_yuyue">去评价</b>
</div>
</case>
<case value="3">
<div class="yuyue_btn" onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>$vo['id']))}">
<div class="yuyue_btn"
onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>
$vo['id']))}">
<b class="click_yuyue">查看评价</b>
</div>
</case>
<default />
<default/>
</switch>
... ... @@ -100,7 +104,7 @@
<div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
<img src="/static/image/btn_yuyue.png">
</div>
<else />
<else/>
<volist name="dxdata" id="vo">
<div class="yuyueList">
<div class="yList_top">
... ... @@ -135,7 +139,7 @@
<div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
<img src="/static/image/btn_yuyue.png">
</div>
<else />
<else/>
<volist name="dpdata" id="vo">
<div class="yuyueList">
<div class="yList_top">
... ... @@ -153,7 +157,8 @@
<i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i>
</div>
</div>
<div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>$vo['teach_id'],'yuyue_id'=>$vo['id']))}">
<div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>
$vo['teach_id'],'yuyue_id'=>$vo['id']))}">
<b class="click_yuyue">去评价</b>
</div>
</div>
... ... @@ -170,7 +175,7 @@
<div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
<img src="/static/image/btn_yuyue.png">
</div>
<else />
<else/>
<volist name="ypdata" id="vo">
<div class="yuyueList">
<div class="yList_top">
... ... @@ -188,7 +193,8 @@
<i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i>
</div>
</div>
<div class="yuyue_btn" onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>$vo['id']))}">
<div class="yuyue_btn" onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>
$vo['id']))}">
<b class="click_yuyue">查看评价</b>
</div>
</div>
... ... @@ -214,50 +220,53 @@
<script type="text/javascript" src="/static/js/common.js"></script>
<script type="text/javascript" src="/static/js/study_car.js"></script>
<script>
$(function(){
$('.yList_top').each(function(){
var colorHtml=$(this).children('b').html();
if(colorHtml=="待学车"){
$(this).children('b').css("color","#53a6fa");
$(function () {
$('.yList_top').each(function () {
var colorHtml = $(this).children('b').html();
if (colorHtml == "待学车") {
$(this).children('b').css("color", "#53a6fa");
}
});
$('.click_yuyue').click(function(){
var id=$(this).attr("data-id");
var cancel_fa=$(this).parent().parent();
var con_text=$(this).html().trim();
if(con_text=="取消预约"){
var yu_day=$(this).parent().prev().prev().find('i').text();
var yu_times=$(this).parent().prev().find('.yu_times').text().split('-')[0];
var yuTime=new Date(yu_day+' '+yu_times).getTime();
var two_hour = 12*3600*1000;
var date=new Date().getTime();
if(yuTime-date<=two_hour){
$('.tan_car').attr("src","/static/image/tan_car2.png");
$('.tan_car').css({"width":"4.97rem","height":"2.88rem"});
$('.click_yuyue').click(function () {
var id = $(this).attr("data-id");
var cancel_fa = $(this).parent().parent();
var con_text = $(this).html().trim();
if (con_text == "取消预约") {
var yu_day = $(this).parent().prev().prev().find('i').text();
var yu_times = $(this).parent().prev().find('.yu_times').text().split('-')[0];
var yuTime = new Date(yu_day + ' ' + yu_times).getTime();
var two_hour = 12 * 3600 * 1000;
var date = new Date().getTime();
if (yuTime - date <= two_hour) {
$('.tan_car').attr("src", "/static/image/tan_car2.png");
$('.tan_car').css({"width": "4.97rem", "height": "2.88rem"});
$('.tan_text').html("抱歉，已过取消预约时间无法取消");
tankuang();
$('.btn_qr').click(function() {
$('.btn_qr').click(function () {
$("html").css("overflow", "auto");
$("body").css("overflow", "auto");
$(".full_bg").hide();
$(".yu_tan").hide();
});
}else{
} else {
tankuang();
$('.btn_qr').click(function(){
$("html").css("overflow","auto");
$("body").css("overflow","auto");
$('.btn_qr').click(function () {
$("html").css("overflow", "auto");
$("body").css("overflow", "auto");
$(".full_bg").hide();
$(".yu_tan").hide();
$.ajax({
url:"{:url('redo')}",
type:"post",
data:{
id:id
},success:function (res) {
if(res.code==1){
url: "{:url('redo')}",
type: "post",
data: {
id: id
}, success: function (res) {
if (res.code == 1) {
cancel_fa.remove();
layer.msg("取消预约成功");
setTimeout(function () {
window.history.go(0);
}, 1500);
}
}
})
... ... @@ -266,24 +275,25 @@
}
});
});
$(function(){
function get(url/*后台的地址*/,obj/*后台需要的数据*/){
var promise = new Promise(function(resolve, reject){
$(function () {
function get(url/*后台的地址*/, obj/*后台需要的数据*/) {
var promise = new Promise(function (resolve, reject) {
$.ajax({
url:url,
data:obj,
success:function(res){
url: url,
data: obj,
success: function (res) {
resolve(res);
},
failure:function(err){
failure: function (err) {
reject(err);
}
})
});//等一下发嗯
return promise;
}
var $div_li =$(".yuyueMenu ul li");
$div_li.click(function(){
var $div_li = $(".yuyueMenu ul li");
$div_li.click(function () {
$(this).addClass("yuyue_cur")
.siblings().removeClass("yuyue_cur");
var index = $div_li.index(this);
... ...
... ... @@ -10,11 +10,24 @@
// +----------------------------------------------------------------------
namespace cmf\controller;
use think\Db;
class UserBaseController extends HomeBaseController
{
public function _initialize()
{
if(session('user.id')){
$login_info = Db::name('user')->where(['id'=>session('user.id')])->find();
if(!$login_info){
session('user.id',null);
header("location:/user/profile/percenter");
}
}
parent::_initialize();
$this->checkUserLogin();
}
... ...