外包项目 / 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 @@ @@ -3,7 +3,7 @@
3 <component name="ChangeListManager"> 3 <component name="ChangeListManager">
4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment=""> 4 <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> 5 <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 - <change beforePath="$PROJECT_DIR$/app/user/controller/YuyueController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/YuyueController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/app/admin/controller/CommentController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/CommentController.php" afterDir="false" />
7 </list> 7 </list>
8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> 8 <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
9 <option name="TRACKING_ENABLED" value="true" /> 9 <option name="TRACKING_ENABLED" value="true" />
@@ -17,69 +17,18 @@ @@ -17,69 +17,18 @@
17 </component> 17 </component>
18 <component name="FileEditorManager"> 18 <component name="FileEditorManager">
19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> 19 <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
20 - <file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="true">  
21 - <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 20 + <file leaf-file-name="SignatureHelper.php" pinned="false" current-in-tab="false">
  21 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
22 <provider selected="true" editor-type-id="text-editor"> 22 <provider selected="true" editor-type-id="text-editor">
23 - <state relative-caret-position="609">  
24 - <caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" />  
25 - <folding>  
26 - <element signature="e#911#990#0#PHP" />  
27 - <element signature="e#1015#1432#0#PHP" />  
28 - <element signature="e#1459#2877#0#PHP" />  
29 - <element signature="e#1502#1569#0#PHP" />  
30 - <element signature="e#1717#1797#0#PHP" />  
31 - <element signature="e#1884#2341#0#PHP" />  
32 - <element signature="e#1946#2053#0#PHP" />  
33 - <element signature="e#2209#2331#0#PHP" />  
34 - <element signature="e#2902#4247#0#PHP" />  
35 - <element signature="e#3375#3420#0#PHP" />  
36 - <element signature="e#3375#3469#0#PHP" />  
37 - <element signature="e#3375#3510#0#PHP" />  
38 - <element signature="e#3375#3553#0#PHP" />  
39 - <element signature="e#3631#3704#0#PHP" />  
40 - <element signature="e#4913#5015#0#PHP" />  
41 - <element signature="e#5338#5425#0#PHP" />  
42 - <element signature="e#6595#7177#1#PHP" />  
43 - <element signature="e#7503#8007#1#PHP" />  
44 - <element signature="e#8213#8299#0#PHP" />  
45 - <element signature="e#8355#8539#0#PHP" />  
46 - <element signature="e#8564#9616#0#PHP" />  
47 - <element signature="e#8820#8865#0#PHP" />  
48 - <element signature="e#8820#8914#0#PHP" />  
49 - <element signature="e#8820#8955#0#PHP" />  
50 - <element signature="e#8820#8998#0#PHP" />  
51 - <element signature="e#9076#9149#0#PHP" />  
52 - <element signature="e#9641#10319#0#PHP" />  
53 - <element signature="e#10344#14313#0#PHP" />  
54 - <element signature="e#10608#14305#0#PHP" />  
55 - <element signature="e#10697#14305#0#PHP" />  
56 - <element signature="e#11141#11228#0#PHP" />  
57 - <element signature="e#11376#14295#0#PHP" />  
58 - <element signature="e#12117#13054#0#PHP" />  
59 - <element signature="e#12425#13036#1#PHP" />  
60 - <element signature="e#13082#14019#0#PHP" />  
61 - <element signature="e#13390#14001#1#PHP" />  
62 - <element signature="e#14209#14295#0#PHP" />  
63 - <element signature="e#14492#14586#0#PHP" />  
64 - <element signature="e#14605#14647#0#PHP" />  
65 - <element signature="e#14605#14697#0#PHP" />  
66 - <element signature="e#14605#14746#0#PHP" />  
67 - <element signature="e#14605#14816#0#PHP" />  
68 - <element signature="e#14605#14858#0#PHP" />  
69 - <element signature="e#14605#14886#0#PHP" />  
70 - </folding>  
71 - </state> 23 + <state relative-caret-position="-99" />
72 </provider> 24 </provider>
73 </entry> 25 </entry>
74 </file> 26 </file>
75 - <file leaf-file-name="ToolController.php" pinned="false" current-in-tab="false">  
76 - <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php"> 27 + <file leaf-file-name="sendSms.php" pinned="false" current-in-tab="false">
  28 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
77 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="2520">  
79 - <caret line="168" selection-start-line="168" selection-end-line="168" />  
80 - <folding>  
81 - <element signature="e#769#1822#0#PHP" />  
82 - </folding> 30 + <state relative-caret-position="1344">
  31 + <caret line="76" selection-start-line="76" selection-end-line="76" />
83 </state> 32 </state>
84 </provider> 33 </provider>
85 </entry> 34 </entry>
@@ -87,128 +36,74 @@ @@ -87,128 +36,74 @@
87 <file leaf-file-name="BookingController.php" pinned="false" current-in-tab="false"> 36 <file leaf-file-name="BookingController.php" pinned="false" current-in-tab="false">
88 <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php"> 37 <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
89 <provider selected="true" editor-type-id="text-editor"> 38 <provider selected="true" editor-type-id="text-editor">
90 - <state relative-caret-position="2898">  
91 - <caret line="147" selection-start-line="147" selection-end-line="147" /> 39 + <state relative-caret-position="534">
  40 + <caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
92 </state> 41 </state>
93 </provider> 42 </provider>
94 </entry> 43 </entry>
95 </file> 44 </file>
96 - <file leaf-file-name="enter.html" pinned="false" current-in-tab="false">  
97 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html"> 45 + <file leaf-file-name="student.html" pinned="false" current-in-tab="false">
  46 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
98 <provider selected="true" editor-type-id="text-editor"> 47 <provider selected="true" editor-type-id="text-editor">
99 - <state relative-caret-position="525">  
100 - <caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />  
101 - <folding>  
102 - <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" />  
103 - </folding> 48 + <state relative-caret-position="468">
  49 + <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
104 </state> 50 </state>
105 </provider> 51 </provider>
106 </entry> 52 </entry>
107 </file> 53 </file>
108 - <file leaf-file-name="index2.htm" pinned="false" current-in-tab="false">  
109 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm"> 54 + <file leaf-file-name="RegController [2].php" pinned="false" current-in-tab="false">
  55 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
110 <provider selected="true" editor-type-id="text-editor"> 56 <provider selected="true" editor-type-id="text-editor">
111 - <state relative-caret-position="2142">  
112 - <caret line="102" column="130" selection-start-line="102" selection-start-column="130" selection-end-line="102" selection-end-column="130" /> 57 + <state relative-caret-position="279">
  58 + <caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
113 </state> 59 </state>
114 </provider> 60 </provider>
115 </entry> 61 </entry>
116 </file> 62 </file>
117 - <file leaf-file-name="enter_introduct.html" pinned="false" current-in-tab="false">  
118 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_introduct.html">  
119 - <provider selected="true" editor-type-id="text-editor" />  
120 - </entry>  
121 - </file>  
122 - <file leaf-file-name="enter_jituanjiagou_acticle.htm" pinned="false" current-in-tab="false">  
123 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm"> 63 + <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
  64 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
124 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
125 - <state relative-caret-position="1449">  
126 - <caret line="69" selection-start-line="69" selection-end-line="69" /> 66 + <state relative-caret-position="188">
  67 + <caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
127 <folding> 68 <folding>
128 - <element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> 69 + <element signature="e#628#666#0#PHP" expanded="true" />
129 </folding> 70 </folding>
130 </state> 71 </state>
131 </provider> 72 </provider>
132 </entry> 73 </entry>
133 </file> 74 </file>
134 - <file leaf-file-name="enter_jituanjiagou.htm" pinned="false" current-in-tab="false">  
135 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm"> 75 + <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
  76 + <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
136 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
137 - <state relative-caret-position="447">  
138 - <caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />  
139 - <folding>  
140 - <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
141 - <element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
142 - <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" />  
143 - <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" />  
144 - <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" />  
145 - <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" />  
146 - <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" />  
147 - <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" />  
148 - <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" />  
149 - <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" />  
150 - <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" />  
151 - <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" />  
152 - <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" />  
153 - <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" />  
154 - <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" />  
155 - <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" />  
156 - <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" />  
157 - <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" />  
158 - <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" />  
159 - <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" />  
160 - <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" />  
161 - <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" />  
162 - <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" />  
163 - <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" />  
164 - <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" />  
165 - <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" />  
166 - <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" />  
167 - <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" />  
168 - <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" />  
169 - <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" />  
170 - <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" />  
171 - <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" />  
172 - <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" />  
173 - <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" />  
174 - <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" />  
175 - <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" />  
176 - <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" />  
177 - <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" />  
178 - <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" />  
179 - <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" />  
180 - <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" />  
181 - <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" />  
182 - <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" />  
183 - <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" />  
184 - <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" />  
185 - <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" />  
186 - <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" />  
187 - <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" />  
188 - <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" />  
189 - <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" />  
190 - <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" />  
191 - <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" />  
192 - <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" />  
193 - </folding> 78 + <state relative-caret-position="321">
  79 + <caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
194 </state> 80 </state>
195 </provider> 81 </provider>
196 </entry> 82 </entry>
197 </file> 83 </file>
198 - <file leaf-file-name="send_template.log" pinned="false" current-in-tab="false">  
199 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log"> 84 + <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="true">
  85 + <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
200 <provider selected="true" editor-type-id="text-editor"> 86 <provider selected="true" editor-type-id="text-editor">
201 - <state relative-caret-position="2646">  
202 - <caret line="126" selection-start-line="125" selection-start-column="436" selection-end-line="126" /> 87 + <state relative-caret-position="357">
  88 + <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
203 </state> 89 </state>
204 </provider> 90 </provider>
205 </entry> 91 </entry>
206 </file> 92 </file>
207 - <file leaf-file-name="index.htm" pinned="false" current-in-tab="false">  
208 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm"> 93 + <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="false">
  94 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
  95 + <provider selected="true" editor-type-id="text-editor">
  96 + <state relative-caret-position="273">
  97 + <caret line="21" selection-start-line="21" selection-end-line="21" />
  98 + </state>
  99 + </provider>
  100 + </entry>
  101 + </file>
  102 + <file leaf-file-name="confirm_order.html" pinned="false" current-in-tab="false">
  103 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
209 <provider selected="true" editor-type-id="text-editor"> 104 <provider selected="true" editor-type-id="text-editor">
210 - <state relative-caret-position="3402">  
211 - <caret line="162" column="16" selection-start-line="162" selection-start-column="16" selection-end-line="162" selection-end-column="29" /> 105 + <state relative-caret-position="357">
  106 + <caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
212 </state> 107 </state>
213 </provider> 108 </provider>
214 </entry> 109 </entry>
@@ -255,15 +150,31 @@ @@ -255,15 +150,31 @@
255 <option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" /> 150 <option value="$PROJECT_DIR$/public/static/css/viyagerapp.css" />
256 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" /> 151 <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html" />
257 <option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" /> 152 <option value="$PROJECT_DIR$/app/admin/controller/PublicController.php" />
258 - <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />  
259 - <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />  
260 - <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />  
261 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" /> 153 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
262 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" /> 154 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
263 - <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />  
264 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" /> 155 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
265 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" /> 156 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
  157 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php" />
  158 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />
  159 + <option value="$PROJECT_DIR$/app/portal/controller/ToolController.php" />
  160 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
  161 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
  162 + <option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
  163 + <option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
  164 + <option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
266 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 165 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
  166 + <option value="$PROJECT_DIR$/public/index.php" />
  167 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" />
  168 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
  169 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php" />
  170 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html" />
  171 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
  172 + <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
  173 + <option value="$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html" />
  174 + <option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
  175 + <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
  176 + <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
  177 + <option value="$PROJECT_DIR$/app/admin/controller/CommentController.php" />
267 </list> 178 </list>
268 </option> 179 </option>
269 </component> 180 </component>
@@ -328,20 +239,62 @@ @@ -328,20 +239,62 @@
328 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 239 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
329 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 240 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
330 <item name="app" type="462c0819:PsiDirectoryNode" /> 241 <item name="app" type="462c0819:PsiDirectoryNode" />
331 - <item name="user" type="462c0819:PsiDirectoryNode" /> 242 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  243 + <item name="controller" type="462c0819:PsiDirectoryNode" />
332 </path> 244 </path>
333 <path> 245 <path>
334 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 246 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
335 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 247 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
336 - <item name="app" type="462c0819:PsiDirectoryNode" />  
337 - <item name="user" type="462c0819:PsiDirectoryNode" />  
338 - <item name="controller" type="462c0819:PsiDirectoryNode" /> 248 + <item name="public" type="462c0819:PsiDirectoryNode" />
  249 + </path>
  250 + <path>
  251 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  252 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  253 + <item name="public" type="462c0819:PsiDirectoryNode" />
  254 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  255 + </path>
  256 + <path>
  257 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  258 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  259 + <item name="public" type="462c0819:PsiDirectoryNode" />
  260 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  261 + <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
  262 + </path>
  263 + <path>
  264 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  265 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  266 + <item name="public" type="462c0819:PsiDirectoryNode" />
  267 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  268 + <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
  269 + <item name="portal" type="462c0819:PsiDirectoryNode" />
  270 + </path>
  271 + <path>
  272 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  273 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  274 + <item name="public" type="462c0819:PsiDirectoryNode" />
  275 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  276 + <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
  277 + <item name="portal" type="462c0819:PsiDirectoryNode" />
  278 + <item name="index" type="462c0819:PsiDirectoryNode" />
339 </path> 279 </path>
340 <path> 280 <path>
341 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 281 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
342 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 282 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
343 <item name="simplewind" type="462c0819:PsiDirectoryNode" /> 283 <item name="simplewind" type="462c0819:PsiDirectoryNode" />
344 </path> 284 </path>
  285 + <path>
  286 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  287 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  288 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  289 + <item name="cmf" type="462c0819:PsiDirectoryNode" />
  290 + </path>
  291 + <path>
  292 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  293 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  294 + <item name="simplewind" type="462c0819:PsiDirectoryNode" />
  295 + <item name="cmf" type="462c0819:PsiDirectoryNode" />
  296 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  297 + </path>
345 </expand> 298 </expand>
346 <select /> 299 <select />
347 </subPane> 300 </subPane>
@@ -351,12 +304,15 @@ @@ -351,12 +304,15 @@
351 </component> 304 </component>
352 <component name="PropertiesComponent"> 305 <component name="PropertiesComponent">
353 <property name="WebServerToolWindowFactoryState" value="false" /> 306 <property name="WebServerToolWindowFactoryState" value="false" />
354 - <property name="last_opened_file_path" value="$PROJECT_DIR$" /> 307 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../ThinkCMF" />
355 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 308 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
356 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 309 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
357 <property name="nodejs_package_manager_path" value="npm" /> 310 <property name="nodejs_package_manager_path" value="npm" />
358 </component> 311 </component>
359 <component name="RecentsManager"> 312 <component name="RecentsManager">
  313 + <key name="CopyFile.RECENT_KEYS">
  314 + <recent name="D:\www\dm161xcgit\public\themes\simpleboot3\portal\index" />
  315 + </key>
360 <key name="MoveFile.RECENT_KEYS"> 316 <key name="MoveFile.RECENT_KEYS">
361 <recent name="$PROJECT_DIR$/api/wxapp" /> 317 <recent name="$PROJECT_DIR$/api/wxapp" />
362 </key> 318 </key>
@@ -389,107 +345,376 @@ @@ -389,107 +345,376 @@
389 <workItem from="1531747533208" duration="2488000" /> 345 <workItem from="1531747533208" duration="2488000" />
390 <workItem from="1531794895610" duration="20000" /> 346 <workItem from="1531794895610" duration="20000" />
391 <workItem from="1535458114609" duration="13848000" /> 347 <workItem from="1535458114609" duration="13848000" />
392 - <workItem from="1535514127808" duration="19000" /> 348 + <workItem from="1535514127808" duration="727000" />
  349 + <workItem from="1535532970259" duration="2527000" />
  350 + <workItem from="1535546044129" duration="20814000" />
  351 + <workItem from="1535633001243" duration="13825000" />
393 </task> 352 </task>
394 - <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">  
395 - <created>1535458170068</created>  
396 - <option name="number" value="00001" />  
397 - <option name="presentableId" value="LOCAL-00001" /> 353 + <task id="LOCAL-00010" summary="已评价无数据情况">
  354 + <created>1535465766116</created>
  355 + <option name="number" value="00010" />
  356 + <option name="presentableId" value="LOCAL-00010" />
398 <option name="project" value="LOCAL" /> 357 <option name="project" value="LOCAL" />
399 - <updated>1535458170068</updated> 358 + <updated>1535465766116</updated>
400 </task> 359 </task>
401 - <task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">  
402 - <created>1535458750848</created>  
403 - <option name="number" value="00002" />  
404 - <option name="presentableId" value="LOCAL-00002" /> 360 + <task id="LOCAL-00011" summary="已评价无数据情况">
  361 + <created>1535465827689</created>
  362 + <option name="number" value="00011" />
  363 + <option name="presentableId" value="LOCAL-00011" />
405 <option name="project" value="LOCAL" /> 364 <option name="project" value="LOCAL" />
406 - <updated>1535458750848</updated> 365 + <updated>1535465827689</updated>
407 </task> 366 </task>
408 - <task id="LOCAL-00003" summary="已经成功报名的用户，不能再次报名 放在确认订单页面">  
409 - <created>1535459632689</created>  
410 - <option name="number" value="00003" />  
411 - <option name="presentableId" value="LOCAL-00003" /> 367 + <task id="LOCAL-00012" summary="已评价无数据情况">
  368 + <created>1535514168713</created>
  369 + <option name="number" value="00012" />
  370 + <option name="presentableId" value="LOCAL-00012" />
412 <option name="project" value="LOCAL" /> 371 <option name="project" value="LOCAL" />
413 - <updated>1535459632689</updated> 372 + <updated>1535514168713</updated>
414 </task> 373 </task>
415 - <task id="LOCAL-00004" summary="已评价无数据情况">  
416 - <created>1535460444090</created>  
417 - <option name="number" value="00004" />  
418 - <option name="presentableId" value="LOCAL-00004" /> 374 + <task id="LOCAL-00013" summary="已评价无数据情况">
  375 + <created>1535533488753</created>
  376 + <option name="number" value="00013" />
  377 + <option name="presentableId" value="LOCAL-00013" />
419 <option name="project" value="LOCAL" /> 378 <option name="project" value="LOCAL" />
420 - <updated>1535460444090</updated> 379 + <updated>1535533488753</updated>
421 </task> 380 </task>
422 - <task id="LOCAL-00005" summary="已评价无数据情况">  
423 - <created>1535461932931</created>  
424 - <option name="number" value="00005" />  
425 - <option name="presentableId" value="LOCAL-00005" /> 381 + <task id="LOCAL-00014" summary="取消预约短信">
  382 + <created>1535534252730</created>
  383 + <option name="number" value="00014" />
  384 + <option name="presentableId" value="LOCAL-00014" />
426 <option name="project" value="LOCAL" /> 385 <option name="project" value="LOCAL" />
427 - <updated>1535461932931</updated> 386 + <updated>1535534252730</updated>
428 </task> 387 </task>
429 - <task id="LOCAL-00006" summary="已评价无数据情况">  
430 - <created>1535462141136</created>  
431 - <option name="number" value="00006" />  
432 - <option name="presentableId" value="LOCAL-00006" /> 388 + <task id="LOCAL-00015" summary="ceshi wode jiaolian">
  389 + <created>1535546534569</created>
  390 + <option name="number" value="00015" />
  391 + <option name="presentableId" value="LOCAL-00015" />
433 <option name="project" value="LOCAL" /> 392 <option name="project" value="LOCAL" />
434 - <updated>1535462141136</updated> 393 + <updated>1535546534569</updated>
435 </task> 394 </task>
436 - <task id="LOCAL-00007" summary="已评价无数据情况">  
437 - <created>1535462428440</created>  
438 - <option name="number" value="00007" />  
439 - <option name="presentableId" value="LOCAL-00007" /> 395 + <task id="LOCAL-00016" summary="ceshi wode jiaolian">
  396 + <created>1535546965523</created>
  397 + <option name="number" value="00016" />
  398 + <option name="presentableId" value="LOCAL-00016" />
440 <option name="project" value="LOCAL" /> 399 <option name="project" value="LOCAL" />
441 - <updated>1535462428440</updated> 400 + <updated>1535546965523</updated>
442 </task> 401 </task>
443 - <task id="LOCAL-00008" summary="已评价无数据情况">  
444 - <created>1535462581974</created>  
445 - <option name="number" value="00008" />  
446 - <option name="presentableId" value="LOCAL-00008" /> 402 + <task id="LOCAL-00017" summary="ceshi wode jiaolian">
  403 + <created>1535547118071</created>
  404 + <option name="number" value="00017" />
  405 + <option name="presentableId" value="LOCAL-00017" />
447 <option name="project" value="LOCAL" /> 406 <option name="project" value="LOCAL" />
448 - <updated>1535462581974</updated> 407 + <updated>1535547118071</updated>
449 </task> 408 </task>
450 - <task id="LOCAL-00009" summary="已评价无数据情况">  
451 - <created>1535465324978</created>  
452 - <option name="number" value="00009" />  
453 - <option name="presentableId" value="LOCAL-00009" /> 409 + <task id="LOCAL-00018" summary="ceshi wode jiaolian">
  410 + <created>1535548842017</created>
  411 + <option name="number" value="00018" />
  412 + <option name="presentableId" value="LOCAL-00018" />
454 <option name="project" value="LOCAL" /> 413 <option name="project" value="LOCAL" />
455 - <updated>1535465324978</updated> 414 + <updated>1535548842017</updated>
456 </task> 415 </task>
457 - <task id="LOCAL-00010" summary="已评价无数据情况">  
458 - <created>1535465766116</created>  
459 - <option name="number" value="00010" />  
460 - <option name="presentableId" value="LOCAL-00010" /> 416 + <task id="LOCAL-00019" summary="测试获取当前时段的老师">
  417 + <created>1535559377550</created>
  418 + <option name="number" value="00019" />
  419 + <option name="presentableId" value="LOCAL-00019" />
461 <option name="project" value="LOCAL" /> 420 <option name="project" value="LOCAL" />
462 - <updated>1535465766116</updated> 421 + <updated>1535559377550</updated>
463 </task> 422 </task>
464 - <task id="LOCAL-00011" summary="已评价无数据情况">  
465 - <created>1535465827689</created>  
466 - <option name="number" value="00011" />  
467 - <option name="presentableId" value="LOCAL-00011" /> 423 + <task id="LOCAL-00020" summary="测试获取当前时段的老师">
  424 + <created>1535559508443</created>
  425 + <option name="number" value="00020" />
  426 + <option name="presentableId" value="LOCAL-00020" />
468 <option name="project" value="LOCAL" /> 427 <option name="project" value="LOCAL" />
469 - <updated>1535465827689</updated> 428 + <updated>1535559508443</updated>
  429 + </task>
  430 + <task id="LOCAL-00021" summary="测试获取当前时段的老师">
  431 + <created>1535559794285</created>
  432 + <option name="number" value="00021" />
  433 + <option name="presentableId" value="LOCAL-00021" />
  434 + <option name="project" value="LOCAL" />
  435 + <updated>1535559794285</updated>
  436 + </task>
  437 + <task id="LOCAL-00022" summary="测试获取当前时段的老师">
  438 + <created>1535559978125</created>
  439 + <option name="number" value="00022" />
  440 + <option name="presentableId" value="LOCAL-00022" />
  441 + <option name="project" value="LOCAL" />
  442 + <updated>1535559978125</updated>
  443 + </task>
  444 + <task id="LOCAL-00023" summary="测试获取当前时段的老师">
  445 + <created>1535560263207</created>
  446 + <option name="number" value="00023" />
  447 + <option name="presentableId" value="LOCAL-00023" />
  448 + <option name="project" value="LOCAL" />
  449 + <updated>1535560263207</updated>
  450 + </task>
  451 + <task id="LOCAL-00024" summary="测试获取当前时段的老师">
  452 + <created>1535560747816</created>
  453 + <option name="number" value="00024" />
  454 + <option name="presentableId" value="LOCAL-00024" />
  455 + <option name="project" value="LOCAL" />
  456 + <updated>1535560747819</updated>
  457 + </task>
  458 + <task id="LOCAL-00025" summary="测试获取当前时段的老师">
  459 + <created>1535560861762</created>
  460 + <option name="number" value="00025" />
  461 + <option name="presentableId" value="LOCAL-00025" />
  462 + <option name="project" value="LOCAL" />
  463 + <updated>1535560861762</updated>
  464 + </task>
  465 + <task id="LOCAL-00026" summary="测试获取当前时段的老师">
  466 + <created>1535561095876</created>
  467 + <option name="number" value="00026" />
  468 + <option name="presentableId" value="LOCAL-00026" />
  469 + <option name="project" value="LOCAL" />
  470 + <updated>1535561095876</updated>
  471 + </task>
  472 + <task id="LOCAL-00027" summary="我的订单详情标题">
  473 + <created>1535600080734</created>
  474 + <option name="number" value="00027" />
  475 + <option name="presentableId" value="LOCAL-00027" />
  476 + <option name="project" value="LOCAL" />
  477 + <updated>1535600080734</updated>
  478 + </task>
  479 + <task id="LOCAL-00028" summary="我的订单详情标题">
  480 + <created>1535633219778</created>
  481 + <option name="number" value="00028" />
  482 + <option name="presentableId" value="LOCAL-00028" />
  483 + <option name="project" value="LOCAL" />
  484 + <updated>1535633219778</updated>
  485 + </task>
  486 + <task id="LOCAL-00029" summary="我的订单详情标题">
  487 + <created>1535633983516</created>
  488 + <option name="number" value="00029" />
  489 + <option name="presentableId" value="LOCAL-00029" />
  490 + <option name="project" value="LOCAL" />
  491 + <updated>1535633983516</updated>
  492 + </task>
  493 + <task id="LOCAL-00030" summary="我的订单详情标题">
  494 + <created>1535634119952</created>
  495 + <option name="number" value="00030" />
  496 + <option name="presentableId" value="LOCAL-00030" />
  497 + <option name="project" value="LOCAL" />
  498 + <updated>1535634119952</updated>
  499 + </task>
  500 + <task id="LOCAL-00031" summary="我的订单详情标题">
  501 + <created>1535634366456</created>
  502 + <option name="number" value="00031" />
  503 + <option name="presentableId" value="LOCAL-00031" />
  504 + <option name="project" value="LOCAL" />
  505 + <updated>1535634366456</updated>
  506 + </task>
  507 + <task id="LOCAL-00032" summary="我的订单详情标题">
  508 + <created>1535634457149</created>
  509 + <option name="number" value="00032" />
  510 + <option name="presentableId" value="LOCAL-00032" />
  511 + <option name="project" value="LOCAL" />
  512 + <updated>1535634457149</updated>
  513 + </task>
  514 + <task id="LOCAL-00033" summary="我的订单详情标题">
  515 + <created>1535634619847</created>
  516 + <option name="number" value="00033" />
  517 + <option name="presentableId" value="LOCAL-00033" />
  518 + <option name="project" value="LOCAL" />
  519 + <updated>1535634619847</updated>
  520 + </task>
  521 + <task id="LOCAL-00034" summary="登录处理">
  522 + <created>1535635187586</created>
  523 + <option name="number" value="00034" />
  524 + <option name="presentableId" value="LOCAL-00034" />
  525 + <option name="project" value="LOCAL" />
  526 + <updated>1535635187586</updated>
  527 + </task>
  528 + <task id="LOCAL-00035" summary="登录处理">
  529 + <created>1535635277832</created>
  530 + <option name="number" value="00035" />
  531 + <option name="presentableId" value="LOCAL-00035" />
  532 + <option name="project" value="LOCAL" />
  533 + <updated>1535635277832</updated>
  534 + </task>
  535 + <task id="LOCAL-00036" summary="登录处理">
  536 + <created>1535636528548</created>
  537 + <option name="number" value="00036" />
  538 + <option name="presentableId" value="LOCAL-00036" />
  539 + <option name="project" value="LOCAL" />
  540 + <updated>1535636528548</updated>
  541 + </task>
  542 + <task id="LOCAL-00037" summary="登录处理">
  543 + <created>1535636670545</created>
  544 + <option name="number" value="00037" />
  545 + <option name="presentableId" value="LOCAL-00037" />
  546 + <option name="project" value="LOCAL" />
  547 + <updated>1535636670545</updated>
  548 + </task>
  549 + <task id="LOCAL-00038" summary="登录处理">
  550 + <created>1535636892256</created>
  551 + <option name="number" value="00038" />
  552 + <option name="presentableId" value="LOCAL-00038" />
  553 + <option name="project" value="LOCAL" />
  554 + <updated>1535636892256</updated>
  555 + </task>
  556 + <task id="LOCAL-00039" summary="登录处理">
  557 + <created>1535636993426</created>
  558 + <option name="number" value="00039" />
  559 + <option name="presentableId" value="LOCAL-00039" />
  560 + <option name="project" value="LOCAL" />
  561 + <updated>1535636993426</updated>
  562 + </task>
  563 + <task id="LOCAL-00040" summary="登录处理">
  564 + <created>1535637256089</created>
  565 + <option name="number" value="00040" />
  566 + <option name="presentableId" value="LOCAL-00040" />
  567 + <option name="project" value="LOCAL" />
  568 + <updated>1535637256089</updated>
  569 + </task>
  570 + <task id="LOCAL-00041" summary="登录处理">
  571 + <created>1535637470734</created>
  572 + <option name="number" value="00041" />
  573 + <option name="presentableId" value="LOCAL-00041" />
  574 + <option name="project" value="LOCAL" />
  575 + <updated>1535637470734</updated>
  576 + </task>
  577 + <task id="LOCAL-00042" summary="登录处理">
  578 + <created>1535637704890</created>
  579 + <option name="number" value="00042" />
  580 + <option name="presentableId" value="LOCAL-00042" />
  581 + <option name="project" value="LOCAL" />
  582 + <updated>1535637704890</updated>
  583 + </task>
  584 + <task id="LOCAL-00043" summary="登录处理">
  585 + <created>1535637833495</created>
  586 + <option name="number" value="00043" />
  587 + <option name="presentableId" value="LOCAL-00043" />
  588 + <option name="project" value="LOCAL" />
  589 + <updated>1535637833495</updated>
  590 + </task>
  591 + <task id="LOCAL-00044" summary="登录处理">
  592 + <created>1535638014265</created>
  593 + <option name="number" value="00044" />
  594 + <option name="presentableId" value="LOCAL-00044" />
  595 + <option name="project" value="LOCAL" />
  596 + <updated>1535638014265</updated>
  597 + </task>
  598 + <task id="LOCAL-00045" summary="登录处理">
  599 + <created>1535638593262</created>
  600 + <option name="number" value="00045" />
  601 + <option name="presentableId" value="LOCAL-00045" />
  602 + <option name="project" value="LOCAL" />
  603 + <updated>1535638593262</updated>
  604 + </task>
  605 + <task id="LOCAL-00046" summary="登录处理">
  606 + <created>1535638797137</created>
  607 + <option name="number" value="00046" />
  608 + <option name="presentableId" value="LOCAL-00046" />
  609 + <option name="project" value="LOCAL" />
  610 + <updated>1535638797137</updated>
  611 + </task>
  612 + <task id="LOCAL-00047" summary="登录处理">
  613 + <created>1535639135284</created>
  614 + <option name="number" value="00047" />
  615 + <option name="presentableId" value="LOCAL-00047" />
  616 + <option name="project" value="LOCAL" />
  617 + <updated>1535639135284</updated>
  618 + </task>
  619 + <task id="LOCAL-00048" summary="登录处理">
  620 + <created>1535640236039</created>
  621 + <option name="number" value="00048" />
  622 + <option name="presentableId" value="LOCAL-00048" />
  623 + <option name="project" value="LOCAL" />
  624 + <updated>1535640236039</updated>
  625 + </task>
  626 + <task id="LOCAL-00049" summary="登录处理">
  627 + <created>1535645567208</created>
  628 + <option name="number" value="00049" />
  629 + <option name="presentableId" value="LOCAL-00049" />
  630 + <option name="project" value="LOCAL" />
  631 + <updated>1535645567208</updated>
  632 + </task>
  633 + <task id="LOCAL-00050" summary="登录处理">
  634 + <created>1535646952275</created>
  635 + <option name="number" value="00050" />
  636 + <option name="presentableId" value="LOCAL-00050" />
  637 + <option name="project" value="LOCAL" />
  638 + <updated>1535646952275</updated>
  639 + </task>
  640 + <task id="LOCAL-00051" summary="登录处理">
  641 + <created>1535647131693</created>
  642 + <option name="number" value="00051" />
  643 + <option name="presentableId" value="LOCAL-00051" />
  644 + <option name="project" value="LOCAL" />
  645 + <updated>1535647131693</updated>
  646 + </task>
  647 + <task id="LOCAL-00052" summary="登录处理">
  648 + <created>1535647189771</created>
  649 + <option name="number" value="00052" />
  650 + <option name="presentableId" value="LOCAL-00052" />
  651 + <option name="project" value="LOCAL" />
  652 + <updated>1535647189771</updated>
  653 + </task>
  654 + <task id="LOCAL-00053" summary="登录处理">
  655 + <created>1535647275205</created>
  656 + <option name="number" value="00053" />
  657 + <option name="presentableId" value="LOCAL-00053" />
  658 + <option name="project" value="LOCAL" />
  659 + <updated>1535647275205</updated>
  660 + </task>
  661 + <task id="LOCAL-00054" summary="登录处理">
  662 + <created>1535647314219</created>
  663 + <option name="number" value="00054" />
  664 + <option name="presentableId" value="LOCAL-00054" />
  665 + <option name="project" value="LOCAL" />
  666 + <updated>1535647314219</updated>
  667 + </task>
  668 + <task id="LOCAL-00055" summary="登录处理">
  669 + <created>1535649389001</created>
  670 + <option name="number" value="00055" />
  671 + <option name="presentableId" value="LOCAL-00055" />
  672 + <option name="project" value="LOCAL" />
  673 + <updated>1535649389001</updated>
  674 + </task>
  675 + <task id="LOCAL-00056" summary="登录处理">
  676 + <created>1535649825078</created>
  677 + <option name="number" value="00056" />
  678 + <option name="presentableId" value="LOCAL-00056" />
  679 + <option name="project" value="LOCAL" />
  680 + <updated>1535649825078</updated>
  681 + </task>
  682 + <task id="LOCAL-00057" summary="登录处理">
  683 + <created>1535649911424</created>
  684 + <option name="number" value="00057" />
  685 + <option name="presentableId" value="LOCAL-00057" />
  686 + <option name="project" value="LOCAL" />
  687 + <updated>1535649911425</updated>
  688 + </task>
  689 + <task id="LOCAL-00058" summary="登录处理">
  690 + <created>1535650097321</created>
  691 + <option name="number" value="00058" />
  692 + <option name="presentableId" value="LOCAL-00058" />
  693 + <option name="project" value="LOCAL" />
  694 + <updated>1535650097321</updated>
470 </task> 695 </task>
471 - <option name="localTasksCounter" value="12" /> 696 + <option name="localTasksCounter" value="59" />
472 <servers /> 697 <servers />
473 </component> 698 </component>
474 <component name="TimeTrackingManager"> 699 <component name="TimeTrackingManager">
475 - <option name="totallyTimeSpent" value="30403000" /> 700 + <option name="totallyTimeSpent" value="68277000" />
476 </component> 701 </component>
477 <component name="ToolWindowManager"> 702 <component name="ToolWindowManager">
478 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 703 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
479 <editor active="true" /> 704 <editor active="true" />
480 <layout> 705 <layout>
481 - <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14179105" /> 706 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
482 <window_info anchor="bottom" id="TODO" order="6" /> 707 <window_info anchor="bottom" id="TODO" order="6" />
483 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" /> 708 <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
484 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" /> 709 <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
485 <window_info anchor="right" id="Database" order="3" /> 710 <window_info anchor="right" id="Database" order="3" />
486 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" /> 711 <window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
  712 + <window_info anchor="bottom" id="Version Control" order="7" weight="0.3293348" />
487 <window_info anchor="bottom" id="Run" order="2" /> 713 <window_info anchor="bottom" id="Run" order="2" />
488 - <window_info anchor="bottom" id="Version Control" order="7" />  
489 <window_info id="Structure" order="1" side_tool="true" weight="0.25" /> 714 <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
490 <window_info anchor="bottom" id="Terminal" order="7" /> 715 <window_info anchor="bottom" id="Terminal" order="7" />
491 - <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />  
492 <window_info id="Favorites" order="2" side_tool="true" /> 716 <window_info id="Favorites" order="2" side_tool="true" />
  717 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
493 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" /> 718 <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
494 <window_info id="npm" order="2" side_tool="true" /> 719 <window_info id="npm" order="2" side_tool="true" />
495 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" /> 720 <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
@@ -499,6 +724,28 @@ @@ -499,6 +724,28 @@
499 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 724 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
500 <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" /> 725 <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
501 </layout> 726 </layout>
  727 + <layout-to-restore>
  728 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  729 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  730 + <window_info id="npm" order="2" side_tool="true" />
  731 + <window_info anchor="bottom" id="Run" order="2" />
  732 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  733 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  734 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
  735 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  736 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  737 + <window_info anchor="bottom" id="TODO" order="6" />
  738 + <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
  739 + <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
  740 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  741 + <window_info anchor="right" id="Database" order="3" />
  742 + <window_info anchor="bottom" id="Terminal" order="9" />
  743 + <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
  744 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  745 + <window_info anchor="bottom" id="Version Control" order="11" />
  746 + <window_info anchor="bottom" id="Message" order="0" />
  747 + <window_info id="Favorites" order="3" side_tool="true" />
  748 + </layout-to-restore>
502 </component> 749 </component>
503 <component name="TypeScriptGeneratedFilesManager"> 750 <component name="TypeScriptGeneratedFilesManager">
504 <option name="version" value="1" /> 751 <option name="version" value="1" />
@@ -511,381 +758,335 @@ @@ -511,381 +758,335 @@
511 <MESSAGE value="修复教练的时间段可以重复预约" /> 758 <MESSAGE value="修复教练的时间段可以重复预约" />
512 <MESSAGE value="已经成功报名的用户，不能再次报名 放在确认订单页面" /> 759 <MESSAGE value="已经成功报名的用户，不能再次报名 放在确认订单页面" />
513 <MESSAGE value="已评价无数据情况" /> 760 <MESSAGE value="已评价无数据情况" />
514 - <option name="LAST_COMMIT_MESSAGE" value="已评价无数据情况" /> 761 + <MESSAGE value="取消预约短信" />
  762 + <MESSAGE value="ceshi wode jiaolian" />
  763 + <MESSAGE value="测试获取当前时段的老师" />
  764 + <MESSAGE value="我的订单详情标题" />
  765 + <MESSAGE value="登录处理" />
  766 + <option name="LAST_COMMIT_MESSAGE" value="登录处理" />
515 </component> 767 </component>
516 <component name="editorHistoryManager"> 768 <component name="editorHistoryManager">
517 - <entry file="file://$PROJECT_DIR$/api/portal/route.php">  
518 - <provider selected="true" editor-type-id="text-editor" /> 769 + <entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php">
  770 + <provider selected="true" editor-type-id="text-editor">
  771 + <state relative-caret-position="126">
  772 + <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" />
  773 + </state>
  774 + </provider>
519 </entry> 775 </entry>
520 - <entry file="file://$PROJECT_DIR$/api/tags.php">  
521 - <provider selected="true" editor-type-id="text-editor" /> 776 + <entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/controller/v1/Token.php" />
  777 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php">
  778 + <provider selected="true" editor-type-id="text-editor">
  779 + <state relative-caret-position="30093">
  780 + <caret line="1448" column="29" selection-start-line="1448" selection-start-column="29" selection-end-line="1448" selection-end-column="29" />
  781 + </state>
  782 + </provider>
522 </entry> 783 </entry>
523 - <entry file="file://$PROJECT_DIR$/api/portal/validate/ArticlesValidate.php">  
524 - <provider selected="true" editor-type-id="text-editor" /> 784 + <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php">
  785 + <provider selected="true" editor-type-id="text-editor">
  786 + <state relative-caret-position="714">
  787 + <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" />
  788 + </state>
  789 + </provider>
525 </entry> 790 </entry>
526 - <entry file="file://$PROJECT_DIR$/api/portal/controller/UserController.php"> 791 + <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php">
527 <provider selected="true" editor-type-id="text-editor"> 792 <provider selected="true" editor-type-id="text-editor">
528 - <state relative-caret-position="-21" /> 793 + <state relative-caret-position="1365">
  794 + <caret line="74" column="32" selection-start-line="74" selection-start-column="32" selection-end-line="74" selection-end-column="32" />
  795 + </state>
  796 + </provider>
  797 + </entry>
  798 + <entry file="file://$PROJECT_DIR$/data/conf/database.php">
  799 + <provider selected="true" editor-type-id="text-editor">
  800 + <state relative-caret-position="273">
  801 + <caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" />
  802 + </state>
529 </provider> 803 </provider>
530 </entry> 804 </entry>
531 - <entry file="file://$PROJECT_DIR$/public/api/index.php"> 805 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/add.html">
532 <provider selected="true" editor-type-id="text-editor" /> 806 <provider selected="true" editor-type-id="text-editor" />
533 </entry> 807 </entry>
534 - <entry file="file://$PROJECT_DIR$/api/home/controller/SlidesController.php"> 808 + <entry file="file://$PROJECT_DIR$/public/static/css/viyagerapp.css" />
  809 + <entry file="file://$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php">
535 <provider selected="true" editor-type-id="text-editor"> 810 <provider selected="true" editor-type-id="text-editor">
536 - <state relative-caret-position="-293" /> 811 + <state relative-caret-position="1113">
  812 + <caret line="53" column="2" selection-start-line="53" selection-start-column="2" selection-end-line="53" selection-end-column="2" />
  813 + </state>
537 </provider> 814 </provider>
538 </entry> 815 </entry>
539 - <entry file="file://$PROJECT_DIR$/api/common/exception/Http.php"> 816 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html">
540 <provider selected="true" editor-type-id="text-editor"> 817 <provider selected="true" editor-type-id="text-editor">
541 - <state relative-caret-position="-98" /> 818 + <state relative-caret-position="693">
  819 + <caret line="33" selection-start-line="33" selection-end-line="33" />
  820 + </state>
542 </provider> 821 </provider>
543 </entry> 822 </entry>
544 - <entry file="file://$PROJECT_DIR$/api/common/model/CommonModel.php"> 823 + <entry file="file://$PROJECT_DIR$/app/admin/controller/PublicController.php">
545 <provider selected="true" editor-type-id="text-editor"> 824 <provider selected="true" editor-type-id="text-editor">
546 - <state relative-caret-position="-974" /> 825 + <state relative-caret-position="966">
  826 + <caret line="55" column="5" selection-start-line="55" selection-start-column="5" selection-end-line="55" selection-end-column="5" />
  827 + </state>
547 </provider> 828 </provider>
548 </entry> 829 </entry>
549 - <entry file="file://$PROJECT_DIR$/api/home/controller/IndexController.php"> 830 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html">
550 <provider selected="true" editor-type-id="text-editor"> 831 <provider selected="true" editor-type-id="text-editor">
551 - <state relative-caret-position="76">  
552 - <caret line="10" column="4" lean-forward="true" selection-start-line="10" selection-start-column="4" selection-end-line="10" selection-end-column="4" /> 832 + <state relative-caret-position="819">
  833 + <caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" />
553 </state> 834 </state>
554 </provider> 835 </provider>
555 </entry> 836 </entry>
556 - <entry file="file://$PROJECT_DIR$/api/home/controller/RestController.php"> 837 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html" />
  838 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm" />
  839 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log" />
  840 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm" />
  841 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_introduct.html" />
  842 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm" />
  843 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/database.php">
557 <provider selected="true" editor-type-id="text-editor"> 844 <provider selected="true" editor-type-id="text-editor">
558 - <state relative-caret-position="-280" /> 845 + <state relative-caret-position="147">
  846 + <caret line="9" column="21" selection-start-line="9" selection-start-column="21" selection-end-line="9" selection-end-column="21" />
  847 + </state>
559 </provider> 848 </provider>
560 </entry> 849 </entry>
561 - <entry file="file://$PROJECT_DIR$/api/home/route.php"> 850 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SysconfigController.php">
562 <provider selected="true" editor-type-id="text-editor"> 851 <provider selected="true" editor-type-id="text-editor">
563 - <state relative-caret-position="76">  
564 - <caret line="4" column="18" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="28" /> 852 + <state relative-caret-position="405">
  853 + <caret line="529" column="42" selection-start-line="529" selection-start-column="38" selection-end-line="529" selection-end-column="42" />
565 </state> 854 </state>
566 </provider> 855 </provider>
567 </entry> 856 </entry>
568 - <entry file="file://$PROJECT_DIR$/api/route.php">  
569 - <provider selected="true" editor-type-id="text-editor" />  
570 - </entry>  
571 - <entry file="file://$PROJECT_DIR$/api/release.php">  
572 - <provider selected="true" editor-type-id="text-editor" />  
573 - </entry>  
574 - <entry file="file://$PROJECT_DIR$/api/debug.php">  
575 - <provider selected="true" editor-type-id="text-editor" />  
576 - </entry>  
577 - <entry file="file://$PROJECT_DIR$/api/database.php">  
578 - <provider selected="true" editor-type-id="text-editor" />  
579 - </entry>  
580 - <entry file="file://$PROJECT_DIR$/api/command.php">  
581 - <provider selected="true" editor-type-id="text-editor" />  
582 - </entry>  
583 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php"> 857 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/IndexController.php">
584 <provider selected="true" editor-type-id="text-editor"> 858 <provider selected="true" editor-type-id="text-editor">
585 - <state relative-caret-position="228">  
586 - <caret line="18" selection-start-line="18" selection-end-line="18" /> 859 + <state relative-caret-position="3108">
  860 + <caret line="158" column="18" lean-forward="true" selection-start-line="158" selection-start-column="18" selection-end-line="158" selection-end-column="18" />
587 </state> 861 </state>
588 </provider> 862 </provider>
589 </entry> 863 </entry>
590 - <entry file="file://$PROJECT_DIR$/api/wxapp/route.php" />  
591 - <entry file="file://$PROJECT_DIR$/api/config.php"> 864 + <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php">
592 <provider selected="true" editor-type-id="text-editor"> 865 <provider selected="true" editor-type-id="text-editor">
593 - <state relative-caret-position="448">  
594 - <caret line="262" column="28" selection-start-line="262" selection-start-column="28" selection-end-line="262" selection-end-column="28" /> 866 + <state relative-caret-position="420">
  867 + <caret line="31" column="33" selection-start-line="31" selection-start-column="33" selection-end-line="31" selection-end-column="33" />
595 </state> 868 </state>
596 </provider> 869 </provider>
597 </entry> 870 </entry>
598 - <entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/service/UserToken.php" />  
599 - <entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/route.php" />  
600 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php"> 871 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php">
601 <provider selected="true" editor-type-id="text-editor"> 872 <provider selected="true" editor-type-id="text-editor">
602 - <state relative-caret-position="126">  
603 - <caret line="20" column="24" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="24" /> 873 + <state relative-caret-position="630">
  874 + <caret line="38" column="36" selection-start-line="38" selection-start-column="36" selection-end-line="38" selection-end-column="36" />
604 </state> 875 </state>
605 </provider> 876 </provider>
606 </entry> 877 </entry>
607 - <entry file="file://$PROJECT_DIR$/api/user/controller/CommentsController.php"> 878 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
608 <provider selected="true" editor-type-id="text-editor"> 879 <provider selected="true" editor-type-id="text-editor">
609 - <state relative-caret-position="126">  
610 - <caret line="18" column="51" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="51" /> 880 + <state relative-caret-position="7602">
  881 + <caret line="362" column="14" selection-start-line="362" selection-start-column="14" selection-end-line="373" selection-end-column="31" />
  882 + <folding>
  883 + <element signature="n#style#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
  884 + <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" />
  885 + <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" />
  886 + <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" />
  887 + <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" />
  888 + <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" />
  889 + </folding>
611 </state> 890 </state>
612 </provider> 891 </provider>
613 </entry> 892 </entry>
614 - <entry file="file://$PROJECT_DIR$/api/user/model/UserModel.php"> 893 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm">
615 <provider selected="true" editor-type-id="text-editor"> 894 <provider selected="true" editor-type-id="text-editor">
616 - <state relative-caret-position="420">  
617 - <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" /> 895 + <state relative-caret-position="3864">
  896 + <caret line="184" column="28" selection-start-line="184" selection-start-column="28" selection-end-line="184" selection-end-column="46" />
618 </state> 897 </state>
619 </provider> 898 </provider>
620 </entry> 899 </entry>
621 - <entry file="file://$PROJECT_DIR$/api/user/model/UserFavoriteModel.php"> 900 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm">
622 <provider selected="true" editor-type-id="text-editor"> 901 <provider selected="true" editor-type-id="text-editor">
623 - <state relative-caret-position="1827">  
624 - <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" /> 902 + <state relative-caret-position="1932">
  903 + <caret line="797" column="85" selection-start-line="797" selection-start-column="85" selection-end-line="797" selection-end-column="85" />
  904 + <folding>
  905 + <element signature="n#style#0;n#head#0;n#html#0;n#!!top" />
  906 + <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" />
  907 + <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" />
  908 + <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" />
  909 + <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" />
  910 + <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" />
  911 + <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" />
  912 + <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" />
  913 + <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" />
  914 + <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" />
  915 + <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" />
  916 + <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" />
  917 + <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" />
  918 + <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" />
  919 + <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" />
  920 + </folding>
625 </state> 921 </state>
626 </provider> 922 </provider>
627 </entry> 923 </entry>
628 - <entry file="file://$PROJECT_DIR$/api/user/route.php"> 924 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/my_order.html">
  925 + <provider selected="true" editor-type-id="text-editor" />
  926 + </entry>
  927 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details.html">
  928 + <provider selected="true" editor-type-id="text-editor" />
  929 + </entry>
  930 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html">
629 <provider selected="true" editor-type-id="text-editor"> 931 <provider selected="true" editor-type-id="text-editor">
630 - <state relative-caret-position="105">  
631 - <caret line="15" column="5" selection-start-line="15" selection-start-column="5" selection-end-line="15" selection-end-column="22" /> 932 + <state relative-caret-position="315">
  933 + <caret line="15" column="48" selection-start-line="15" selection-start-column="48" selection-end-line="15" selection-end-column="48" />
632 </state> 934 </state>
633 </provider> 935 </provider>
634 </entry> 936 </entry>
635 - <entry file="file://$PROJECT_DIR$/api/user/controller/FavoritesController.php"> 937 + <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
636 <provider selected="true" editor-type-id="text-editor"> 938 <provider selected="true" editor-type-id="text-editor">
637 - <state relative-caret-position="126">  
638 - <caret line="12" column="27" selection-start-line="12" selection-start-column="27" selection-end-line="12" selection-end-column="27" /> 939 + <state relative-caret-position="420">
  940 + <caret line="47" column="44" lean-forward="true" selection-start-line="47" selection-start-column="44" selection-end-line="47" selection-end-column="44" />
639 </state> 941 </state>
640 </provider> 942 </provider>
641 </entry> 943 </entry>
642 - <entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/controller/v1/Token.php" />  
643 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/common.php"> 944 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
644 <provider selected="true" editor-type-id="text-editor"> 945 <provider selected="true" editor-type-id="text-editor">
645 - <state relative-caret-position="30093">  
646 - <caret line="1448" column="29" selection-start-line="1448" selection-start-column="29" selection-end-line="1448" selection-end-column="29" /> 946 + <state relative-caret-position="420">
  947 + <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
647 </state> 948 </state>
648 </provider> 949 </provider>
649 </entry> 950 </entry>
650 - <entry file="file://$PROJECT_DIR$/simplewind/extend/wxapp/aes/WXBizDataCrypt.php"> 951 + <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
  952 + <provider selected="true" editor-type-id="text-editor" />
  953 + </entry>
  954 + <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
651 <provider selected="true" editor-type-id="text-editor"> 955 <provider selected="true" editor-type-id="text-editor">
652 - <state relative-caret-position="714">  
653 - <caret line="34" column="20" selection-start-line="34" selection-start-column="20" selection-end-line="34" selection-end-column="20" /> 956 + <state relative-caret-position="660">
  957 + <caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
  958 + <folding>
  959 + <element signature="e#636#668#0#PHP" expanded="true" />
  960 + <element signature="e#17688#17731#0#PHP" />
  961 + <element signature="e#17688#17779#0#PHP" />
  962 + </folding>
654 </state> 963 </state>
655 </provider> 964 </provider>
656 </entry> 965 </entry>
657 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/PublicController.php"> 966 + <entry file="file://$PROJECT_DIR$/public/index.php">
658 <provider selected="true" editor-type-id="text-editor"> 967 <provider selected="true" editor-type-id="text-editor">
659 - <state relative-caret-position="1365">  
660 - <caret line="74" column="32" selection-start-line="74" selection-start-column="32" selection-end-line="74" selection-end-column="32" /> 968 + <state relative-caret-position="126">
  969 + <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
661 </state> 970 </state>
662 </provider> 971 </provider>
663 </entry> 972 </entry>
664 - <entry file="file://$PROJECT_DIR$/data/conf/database.php"> 973 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
665 <provider selected="true" editor-type-id="text-editor"> 974 <provider selected="true" editor-type-id="text-editor">
666 - <state relative-caret-position="273">  
667 - <caret line="15" column="23" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="23" /> 975 + <state relative-caret-position="420">
  976 + <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
668 </state> 977 </state>
669 </provider> 978 </provider>
670 </entry> 979 </entry>
671 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/user/add.html"> 980 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
672 <provider selected="true" editor-type-id="text-editor" /> 981 <provider selected="true" editor-type-id="text-editor" />
673 </entry> 982 </entry>
674 - <entry file="file://$PROJECT_DIR$/public/static/css/viyagerapp.css" />  
675 - <entry file="file://$PROJECT_DIR$/data/lang/zh-cn/admin_menu.php"> 983 + <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
676 <provider selected="true" editor-type-id="text-editor"> 984 <provider selected="true" editor-type-id="text-editor">
677 - <state relative-caret-position="1113">  
678 - <caret line="53" column="2" selection-start-line="53" selection-start-column="2" selection-end-line="53" selection-end-column="2" /> 985 + <state relative-caret-position="549">
  986 + <caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" />
679 </state> 987 </state>
680 </provider> 988 </provider>
681 </entry> 989 </entry>
682 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/login.html"> 990 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
683 <provider selected="true" editor-type-id="text-editor"> 991 <provider selected="true" editor-type-id="text-editor">
684 - <state relative-caret-position="693">  
685 - <caret line="33" selection-start-line="33" selection-end-line="33" />  
686 - </state> 992 + <state relative-caret-position="-99" />
687 </provider> 993 </provider>
688 </entry> 994 </entry>
689 - <entry file="file://$PROJECT_DIR$/app/admin/controller/PublicController.php"> 995 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
690 <provider selected="true" editor-type-id="text-editor"> 996 <provider selected="true" editor-type-id="text-editor">
691 - <state relative-caret-position="966">  
692 - <caret line="55" column="5" selection-start-line="55" selection-start-column="5" selection-end-line="55" selection-end-column="5" /> 997 + <state relative-caret-position="1344">
  998 + <caret line="76" selection-start-line="76" selection-end-line="76" />
693 </state> 999 </state>
694 </provider> 1000 </provider>
695 </entry> 1001 </entry>
696 - <entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/public/header.html"> 1002 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
697 <provider selected="true" editor-type-id="text-editor"> 1003 <provider selected="true" editor-type-id="text-editor">
698 - <state relative-caret-position="819">  
699 - <caret line="39" column="21" lean-forward="true" selection-start-line="39" selection-start-column="21" selection-end-line="39" selection-end-column="21" /> 1004 + <state relative-caret-position="2440">
  1005 + <caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" />
  1006 + <folding>
  1007 + <element signature="e#2713#3721#0#PHP" />
  1008 + <element signature="e#5505#6819#0#PHP" />
  1009 + </folding>
700 </state> 1010 </state>
701 </provider> 1011 </provider>
702 </entry> 1012 </entry>
703 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php"> 1013 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php">
704 <provider selected="true" editor-type-id="text-editor"> 1014 <provider selected="true" editor-type-id="text-editor">
705 - <state relative-caret-position="336">  
706 - <caret line="66" column="46" selection-start-line="66" selection-start-column="46" selection-end-line="66" selection-end-column="46" /> 1015 + <state relative-caret-position="126">
  1016 + <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
707 </state> 1017 </state>
708 </provider> 1018 </provider>
709 </entry> 1019 </entry>
710 - <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 1020 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
711 <provider selected="true" editor-type-id="text-editor"> 1021 <provider selected="true" editor-type-id="text-editor">
712 - <state relative-caret-position="-1701" /> 1022 + <state relative-caret-position="468">
  1023 + <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
  1024 + </state>
713 </provider> 1025 </provider>
714 </entry> 1026 </entry>
715 - <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php"> 1027 + <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
716 <provider selected="true" editor-type-id="text-editor"> 1028 <provider selected="true" editor-type-id="text-editor">
717 - <state relative-caret-position="2898">  
718 - <caret line="147" selection-start-line="147" selection-end-line="147" /> 1029 + <state relative-caret-position="273">
  1030 + <caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
719 </state> 1031 </state>
720 </provider> 1032 </provider>
721 </entry> 1033 </entry>
722 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index.htm"> 1034 + <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
723 <provider selected="true" editor-type-id="text-editor"> 1035 <provider selected="true" editor-type-id="text-editor">
724 - <state relative-caret-position="3402">  
725 - <caret line="162" column="16" selection-start-line="162" selection-start-column="16" selection-end-line="162" selection-end-column="29" /> 1036 + <state relative-caret-position="534">
  1037 + <caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
726 </state> 1038 </state>
727 </provider> 1039 </provider>
728 </entry> 1040 </entry>
729 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter.html"> 1041 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [2].php">
730 <provider selected="true" editor-type-id="text-editor"> 1042 <provider selected="true" editor-type-id="text-editor">
731 - <state relative-caret-position="525">  
732 - <caret line="25" column="16" selection-start-line="25" selection-start-column="16" selection-end-line="25" selection-end-column="16" />  
733 - <folding>  
734 - <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" />  
735 - </folding> 1043 + <state relative-caret-position="567">
  1044 + <caret line="214" column="50" lean-forward="true" selection-start-line="214" selection-start-column="50" selection-end-line="214" selection-end-column="50" />
736 </state> 1045 </state>
737 </provider> 1046 </provider>
738 </entry> 1047 </entry>
739 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/index2.htm"> 1048 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
740 <provider selected="true" editor-type-id="text-editor"> 1049 <provider selected="true" editor-type-id="text-editor">
741 - <state relative-caret-position="2142">  
742 - <caret line="102" column="130" selection-start-line="102" selection-start-column="130" selection-end-line="102" selection-end-column="130" /> 1050 + <state relative-caret-position="279">
  1051 + <caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
743 </state> 1052 </state>
744 </provider> 1053 </provider>
745 </entry> 1054 </entry>
746 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController.php" />  
747 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/send_template.log"> 1055 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
748 <provider selected="true" editor-type-id="text-editor"> 1056 <provider selected="true" editor-type-id="text-editor">
749 - <state relative-caret-position="2646">  
750 - <caret line="126" selection-start-line="125" selection-start-column="436" selection-end-line="126" /> 1057 + <state relative-caret-position="357">
  1058 + <caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
751 </state> 1059 </state>
752 </provider> 1060 </provider>
753 </entry> 1061 </entry>
754 - <entry file="file://$PROJECT_DIR$/app/portal/controller/ToolController.php"> 1062 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
755 <provider selected="true" editor-type-id="text-editor"> 1063 <provider selected="true" editor-type-id="text-editor">
756 - <state relative-caret-position="2520">  
757 - <caret line="168" selection-start-line="168" selection-end-line="168" /> 1064 + <state relative-caret-position="188">
  1065 + <caret line="131" column="6" lean-forward="true" selection-start-line="131" selection-start-column="6" selection-end-line="131" selection-end-column="6" />
758 <folding> 1066 <folding>
759 - <element signature="e#769#1822#0#PHP" /> 1067 + <element signature="e#628#666#0#PHP" expanded="true" />
760 </folding> 1068 </folding>
761 </state> 1069 </state>
762 </provider> 1070 </provider>
763 </entry> 1071 </entry>
764 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou_acticle.htm"> 1072 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
765 <provider selected="true" editor-type-id="text-editor"> 1073 <provider selected="true" editor-type-id="text-editor">
766 - <state relative-caret-position="1449">  
767 - <caret line="69" selection-start-line="69" selection-end-line="69" />  
768 - <folding>  
769 - <element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
770 - </folding> 1074 + <state relative-caret-position="273">
  1075 + <caret line="21" selection-start-line="21" selection-end-line="21" />
771 </state> 1076 </state>
772 </provider> 1077 </provider>
773 </entry> 1078 </entry>
774 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_introduct.html">  
775 - <provider selected="true" editor-type-id="text-editor" />  
776 - </entry>  
777 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/enter_jituanjiagou.htm"> 1079 + <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
778 <provider selected="true" editor-type-id="text-editor"> 1080 <provider selected="true" editor-type-id="text-editor">
779 - <state relative-caret-position="447">  
780 - <caret line="132" column="176" selection-start-line="132" selection-start-column="176" selection-end-line="132" selection-end-column="176" />  
781 - <folding>  
782 - <element signature="n#style#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
783 - <element signature="n#style#0;n#div#1;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />  
784 - <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" />  
785 - <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" />  
786 - <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" />  
787 - <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" />  
788 - <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" />  
789 - <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" />  
790 - <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" />  
791 - <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" />  
792 - <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" />  
793 - <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" />  
794 - <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" />  
795 - <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" />  
796 - <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" />  
797 - <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" />  
798 - <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" />  
799 - <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" />  
800 - <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" />  
801 - <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" />  
802 - <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" />  
803 - <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" />  
804 - <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" />  
805 - <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" />  
806 - <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" />  
807 - <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" />  
808 - <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" />  
809 - <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" />  
810 - <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" />  
811 - <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" />  
812 - <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" />  
813 - <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" />  
814 - <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" />  
815 - <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" />  
816 - <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" />  
817 - <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" />  
818 - <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" />  
819 - <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" />  
820 - <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" />  
821 - <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" />  
822 - <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" />  
823 - <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" />  
824 - <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" />  
825 - <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" />  
826 - <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" />  
827 - <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" />  
828 - <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" />  
829 - <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" />  
830 - <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" />  
831 - <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" />  
832 - <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" />  
833 - <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" />  
834 - <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" />  
835 - </folding> 1081 + <state relative-caret-position="321">
  1082 + <caret line="30" column="78" selection-start-line="30" selection-start-column="78" selection-end-line="30" selection-end-column="78" />
836 </state> 1083 </state>
837 </provider> 1084 </provider>
838 </entry> 1085 </entry>
839 - <entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php"> 1086 + <entry file="file://$PROJECT_DIR$/app/admin/controller/CommentController.php">
840 <provider selected="true" editor-type-id="text-editor"> 1087 <provider selected="true" editor-type-id="text-editor">
841 - <state relative-caret-position="609">  
842 - <caret line="186" column="81" selection-start-line="186" selection-start-column="81" selection-end-line="186" selection-end-column="81" />  
843 - <folding>  
844 - <element signature="e#911#990#0#PHP" />  
845 - <element signature="e#1015#1432#0#PHP" />  
846 - <element signature="e#1459#2877#0#PHP" />  
847 - <element signature="e#1502#1569#0#PHP" />  
848 - <element signature="e#1717#1797#0#PHP" />  
849 - <element signature="e#1884#2341#0#PHP" />  
850 - <element signature="e#1946#2053#0#PHP" />  
851 - <element signature="e#2209#2331#0#PHP" />  
852 - <element signature="e#2902#4247#0#PHP" />  
853 - <element signature="e#3375#3420#0#PHP" />  
854 - <element signature="e#3375#3469#0#PHP" />  
855 - <element signature="e#3375#3510#0#PHP" />  
856 - <element signature="e#3375#3553#0#PHP" />  
857 - <element signature="e#3631#3704#0#PHP" />  
858 - <element signature="e#4913#5015#0#PHP" />  
859 - <element signature="e#5338#5425#0#PHP" />  
860 - <element signature="e#6595#7177#1#PHP" />  
861 - <element signature="e#7503#8007#1#PHP" />  
862 - <element signature="e#8213#8299#0#PHP" />  
863 - <element signature="e#8355#8539#0#PHP" />  
864 - <element signature="e#8564#9616#0#PHP" />  
865 - <element signature="e#8820#8865#0#PHP" />  
866 - <element signature="e#8820#8914#0#PHP" />  
867 - <element signature="e#8820#8955#0#PHP" />  
868 - <element signature="e#8820#8998#0#PHP" />  
869 - <element signature="e#9076#9149#0#PHP" />  
870 - <element signature="e#9641#10319#0#PHP" />  
871 - <element signature="e#10344#14313#0#PHP" />  
872 - <element signature="e#10608#14305#0#PHP" />  
873 - <element signature="e#10697#14305#0#PHP" />  
874 - <element signature="e#11141#11228#0#PHP" />  
875 - <element signature="e#11376#14295#0#PHP" />  
876 - <element signature="e#12117#13054#0#PHP" />  
877 - <element signature="e#12425#13036#1#PHP" />  
878 - <element signature="e#13082#14019#0#PHP" />  
879 - <element signature="e#13390#14001#1#PHP" />  
880 - <element signature="e#14209#14295#0#PHP" />  
881 - <element signature="e#14492#14586#0#PHP" />  
882 - <element signature="e#14605#14647#0#PHP" />  
883 - <element signature="e#14605#14697#0#PHP" />  
884 - <element signature="e#14605#14746#0#PHP" />  
885 - <element signature="e#14605#14816#0#PHP" />  
886 - <element signature="e#14605#14858#0#PHP" />  
887 - <element signature="e#14605#14886#0#PHP" />  
888 - </folding> 1088 + <state relative-caret-position="357">
  1089 + <caret line="177" column="24" selection-start-line="177" selection-start-column="24" selection-end-line="177" selection-end-column="24" />
889 </state> 1090 </state>
890 </provider> 1091 </provider>
891 </entry> 1092 </entry>
@@ -192,6 +192,7 @@ class BookingController extends AdminBaseController @@ -192,6 +192,7 @@ class BookingController extends AdminBaseController
192 } 192 }
193 193
194 $where['yy.create_time'] = array('gt',0); 194 $where['yy.create_time'] = array('gt',0);
  195 + $where['yy.uid'] = array('gt',0);
195 $list = DB::name('yuyue') 196 $list = DB::name('yuyue')
196 ->alias('yy') 197 ->alias('yy')
197 ->join('qnb_user u','u.id=yy.teach_id') 198 ->join('qnb_user u','u.id=yy.teach_id')
@@ -133,7 +133,7 @@ class CommentController extends AdminBaseController @@ -133,7 +133,7 @@ class CommentController extends AdminBaseController
133 if (!empty($mobile)) { 133 if (!empty($mobile)) {
134 $where['mobile'] = $mobile; 134 $where['mobile'] = $mobile;
135 } 135 }
136 - $where['delete_time'] = 0; 136 + $where['c.delete_time'] = 0;
137 $list = DB::name($this->table_name) 137 $list = DB::name($this->table_name)
138 ->alias('c') 138 ->alias('c')
139 ->join('qnb_user u','u.id=c.teach_id') 139 ->join('qnb_user u','u.id=c.teach_id')
@@ -175,7 +175,7 @@ class CommentController extends AdminBaseController @@ -175,7 +175,7 @@ class CommentController extends AdminBaseController
175 ->alias('c') 175 ->alias('c')
176 ->join('qnb_user u','u.id=c.uid') 176 ->join('qnb_user u','u.id=c.uid')
177 ->field('c.*') 177 ->field('c.*')
178 - ->where(['delete_time'=>0]) 178 + ->where(['c.delete_time'=>0])
179 ->paginate(15); 179 ->paginate(15);
180 180
181 $this->assign("list", $list->items()); 181 $this->assign("list", $list->items());
@@ -80,6 +80,7 @@ class UserController extends AdminBaseController @@ -80,6 +80,7 @@ class UserController extends AdminBaseController
80 { 80 {
81 /**查询条件**/ 81 /**查询条件**/
82 $where = ["user_type" => 2]; 82 $where = ["user_type" => 2];
  83 + $where = ["student_type" => 1];
83 /**搜索条件**/ 84 /**搜索条件**/
84 $user_nickname = $this->request->param('user_nickname'); 85 $user_nickname = $this->request->param('user_nickname');
85 $mobile = trim($this->request->param('mobile')); 86 $mobile = trim($this->request->param('mobile'));
@@ -110,12 +110,12 @@ class IndexController extends HomeBaseController @@ -110,12 +110,12 @@ class IndexController extends HomeBaseController
110 ->find(); 110 ->find();
111 if ($re) { 111 if ($re) {
112 $dataup['id'] = $re['id']; 112 $dataup['id'] = $re['id'];
113 - session('user.id', $dataup['id']); 113 + session('pay_uid', $dataup['id']);
114 $res = Db::name('user')->update($dataup); 114 $res = Db::name('user')->update($dataup);
115 if ($res) { 115 if ($res) {
116 return json(['code' => '1', 'msg' => '保存成功']); 116 return json(['code' => '1', 'msg' => '保存成功']);
117 } else { 117 } else {
118 - return json(['code' => '0', 'msg' => '保存失败']); 118 + return json(['code' => '1', 'msg' => '报名信息更新成功']);
119 } 119 }
120 } else { 120 } else {
121 return json(['code' => '0', 'msg' => '保存失败']); 121 return json(['code' => '0', 'msg' => '保存失败']);
@@ -129,7 +129,7 @@ class IndexController extends HomeBaseController @@ -129,7 +129,7 @@ class IndexController extends HomeBaseController
129 { 129 {
130 130
131 $gid = $req->param('gid'); 131 $gid = $req->param('gid');
132 - $id = session('user.id'); 132 + $id = session('pay_uid');
133 $re = Db::name('user')->where(['id' => $id])->find(); 133 $re = Db::name('user')->where(['id' => $id])->find();
134 $res = Db::name('goods')->where(['id' => $gid])->find(); 134 $res = Db::name('goods')->where(['id' => $gid])->find();
135 135
@@ -146,7 +146,7 @@ class IndexController extends HomeBaseController @@ -146,7 +146,7 @@ class IndexController extends HomeBaseController
146 146
147 $gid = $req->param('gid'); 147 $gid = $req->param('gid');
148 $res = Db::name('goods')->where(['id' => $gid])->find(); 148 $res = Db::name('goods')->where(['id' => $gid])->find();
149 - $id = session('user.id'); 149 + $id = session('pay_uid');
150 $data['gid'] = $gid; 150 $data['gid'] = $gid;
151 $data['uid'] = $id; 151 $data['uid'] = $id;
152 $data['create_time'] = time(); 152 $data['create_time'] = time();
@@ -160,6 +160,13 @@ class IndexController extends HomeBaseController @@ -160,6 +160,13 @@ class IndexController extends HomeBaseController
160 } 160 }
161 } 161 }
162 162
  163 + //支付成功 ajax
  164 + public function pay_success()
  165 + {
  166 +
  167 + return $this->fetch();
  168 + }
  169 +
163 170
164 //学员手册 171 //学员手册
165 public function student_shouce() 172 public function student_shouce()
@@ -17,6 +17,28 @@ use think\Db; @@ -17,6 +17,28 @@ use think\Db;
17 17
18 class ToolController extends HomeBaseController 18 class ToolController extends HomeBaseController
19 { 19 {
  20 +
  21 + public function isMixTime($begintime1,$endtime1,$begintime2,$endtime2)
  22 + {
  23 + $status = $begintime2 - $begintime1;
  24 + if($status>0){
  25 + $status2 = $begintime2 - $endtime1;
  26 + if($status2>=0){
  27 + return false;
  28 + }else{
  29 + return true;
  30 + }
  31 + }else{
  32 + $status2 = $begintime1 - $endtime2;
  33 + if($status2>=0){
  34 + return false;
  35 + }else{
  36 +
  37 + return true;
  38 + }
  39 + }
  40 + }
  41 +
20 public function get_relax_time() 42 public function get_relax_time()
21 { 43 {
22 $day = $this->request->param('day'); 44 $day = $this->request->param('day');
@@ -31,7 +53,6 @@ class ToolController extends HomeBaseController @@ -31,7 +53,6 @@ class ToolController extends HomeBaseController
31 for($t = 6;$t<=18;$t++){ 53 for($t = 6;$t<=18;$t++){
32 $all_arr[]=$t; 54 $all_arr[]=$t;
33 } 55 }
34 -  
35 $arr = []; 56 $arr = [];
36 for($i = 0;$i<count($res);$i++){ 57 for($i = 0;$i<count($res);$i++){
37 $begin = $res[$i]["yuyue_begin"]; 58 $begin = $res[$i]["yuyue_begin"];
@@ -48,7 +69,6 @@ class ToolController extends HomeBaseController @@ -48,7 +69,6 @@ class ToolController extends HomeBaseController
48 $ok_arr[] = "yes"; 69 $ok_arr[] = "yes";
49 } 70 }
50 } 71 }
51 -  
52 if ($ok_arr){ 72 if ($ok_arr){
53 return json(['code'=>'1','msg'=>'获取成功','data'=>json_encode($ok_arr,true)]); 73 return json(['code'=>'1','msg'=>'获取成功','data'=>json_encode($ok_arr,true)]);
54 }else{ 74 }else{
@@ -25,10 +25,19 @@ class LoginController extends HomeBaseController @@ -25,10 +25,19 @@ class LoginController extends HomeBaseController
25 { 25 {
26 //session('user.id','10'); 26 //session('user.id','10');
27 $ress = Db::name('user')->where(['openid'=>session('openid')])->find(); 27 $ress = Db::name('user')->where(['openid'=>session('openid')])->find();
28 - if($ress && $ress['mobile'] != ''){ 28 + if($ress && $ress['mobile'] != '' ){
  29 + //已支付学员
  30 + if($ress['user_type'] == '2'){
  31 + if($ress['student_type'] == '1' and $ress['delete_time'] == '0'){
29 session('user.id',$ress['id']); 32 session('user.id',$ress['id']);
30 return redirect($this->request->root() . '/user/profile/percenter'); 33 return redirect($this->request->root() . '/user/profile/percenter');
31 } 34 }
  35 + }else{
  36 + session('user.id',$ress['id']);
  37 + return redirect($this->request->root() . '/user/profile/percenter');
  38 + }
  39 +
  40 + }
32 41
33 $redirect = $this->request->post("redirect"); 42 $redirect = $this->request->post("redirect");
34 if (empty($redirect)) { 43 if (empty($redirect)) {
@@ -74,6 +83,12 @@ class LoginController extends HomeBaseController @@ -74,6 +83,12 @@ class LoginController extends HomeBaseController
74 $res = Db::name('user')->where(['mobile'=>$mobile])->find(); 83 $res = Db::name('user')->where(['mobile'=>$mobile])->find();
75 84
76 if($res){ 85 if($res){
  86 +
  87 + //学员未支付 学员被删除 不可以登录
  88 + if (($res['user_type'] == '2' and $res['student_type'] != '1') or $res['delete_time'] != '0'){
  89 + return json(['code'=>'0','msg'=>'抱歉，此用户没有权限登录']);
  90 + }
  91 +
77 //后台添加用户，微信登陆后合并数据 92 //后台添加用户，微信登陆后合并数据
78 if($res['add_type'] == '2'){ 93 if($res['add_type'] == '2'){
79 $op_tel_info = Db::name('user')->where(['openid'=>session('openid'),'mobile'=>$mobile])->find(); 94 $op_tel_info = Db::name('user')->where(['openid'=>session('openid'),'mobile'=>$mobile])->find();
@@ -89,11 +104,6 @@ class LoginController extends HomeBaseController @@ -89,11 +104,6 @@ class LoginController extends HomeBaseController
89 } 104 }
90 } 105 }
91 //学员成功支付后才可以登陆 106 //学员成功支付后才可以登陆
92 - }elseif ($res['user_type'] == '2' and $res['student_type'] == '2'){  
93 - return json(['code'=>'0','msg'=>'抱歉，此用户没有权限登录']);  
94 - //用户被拉黑  
95 - }elseif($res['user_status'] != '1'){  
96 - return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);  
97 } 107 }
98 session('user.id',$res['id']); 108 session('user.id',$res['id']);
99 return json(['code'=>'1','msg'=>'登陆成功']); 109 return json(['code'=>'1','msg'=>'登陆成功']);
@@ -17,7 +17,6 @@ use think\Db; @@ -17,7 +17,6 @@ use think\Db;
17 use think\Request; 17 use think\Request;
18 use app\portal\controller\ToolController as tool; 18 use app\portal\controller\ToolController as tool;
19 19
20 -  
21 class YuyueController extends UserBaseController 20 class YuyueController extends UserBaseController
22 { 21 {
23 22
@@ -45,8 +44,9 @@ class YuyueController extends UserBaseController @@ -45,8 +44,9 @@ class YuyueController extends UserBaseController
45 } 44 }
46 45
47 //step3：选择响应时间教练 46 //step3：选择响应时间教练
48 - public function coach_list() 47 + public function coach_list(tool $tool)
49 { 48 {
  49 +
50 if (!session('yuyue_pre.day')) { 50 if (!session('yuyue_pre.day')) {
51 echo '非法请求'; 51 echo '非法请求';
52 } 52 }
@@ -61,20 +61,12 @@ class YuyueController extends UserBaseController @@ -61,20 +61,12 @@ class YuyueController extends UserBaseController
61 61
62 //获取当前时段已被预约的教练 62 //获取当前时段已被预约的教练
63 $ex = ''; 63 $ex = '';
  64 +
64 foreach ($rr as $v) { 65 foreach ($rr as $v) {
65 - $day_find = [];  
66 - for ($i = $v['yuyue_begin']; $i <= $v['yuyue_end']; $i++) {  
67 - $day_find[] = $i;  
68 - }  
69 - $f1 = array_search($bbegin, $day_find);  
70 - $f2 = array_search($eend, $day_find);  
71 - $ac = count($day_find) - 1; 66 + $res = $tool->isMixTime($bbegin,$eend,$v['yuyue_begin'],$v['yuyue_end']);
  67 + $res && $ex .= $v['teach_id'] . ',';
72 68
73 - if (($f2 && $f2 > '0') || ($f1 && $f1 < $ac) || ($f1 && $f2)) {  
74 - $ex .= $v['teach_id'] . ',';  
75 - }  
76 } 69 }
77 -  
78 //获取当前时段有时间的教练 70 //获取当前时段有时间的教练
79 $where['user_type'] = 3; 71 $where['user_type'] = 3;
80 $where['id'] = array('not in', $ex); 72 $where['id'] = array('not in', $ex);
@@ -162,9 +154,9 @@ class YuyueController extends UserBaseController @@ -162,9 +154,9 @@ class YuyueController extends UserBaseController
162 if ($res) { 154 if ($res) {
163 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find(); 155 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
164 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find(); 156 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
165 - $msg = "您好！您已成功预约：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】"; 157 + $msg = "您好！您已成功预约：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
166 $tool->get_sms_code_p($stu_info['mobile'], $msg); 158 $tool->get_sms_code_p($stu_info['mobile'], $msg);
167 - $msg1 = "您好！您的：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】"; 159 + $msg1 = "您好！您的：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
168 $tool->get_sms_code_p($tea_info['mobile'], $msg1); 160 $tool->get_sms_code_p($tea_info['mobile'], $msg1);
169 $param1 = [ 161 $param1 = [
170 'touser' => $stu_info['openid'], 162 'touser' => $stu_info['openid'],
@@ -190,7 +182,8 @@ class YuyueController extends UserBaseController @@ -190,7 +182,8 @@ class YuyueController extends UserBaseController
190 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'), 182 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
191 'keyword2' => array('value' => $stu_info['mobile']), 183 'keyword2' => array('value' => $stu_info['mobile']),
192 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'), 184 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
193 - 'keyword4' => array('value' => "点击查看预约并确认预约") 185 + 'keyword4' => array('value' => $tea_info['user_nickname']),
  186 + 'remark' => array('value' => "点击查看预约并确认预约")
194 ) 187 )
195 ]; 188 ];
196 189
@@ -302,36 +295,36 @@ class YuyueController extends UserBaseController @@ -302,36 +295,36 @@ class YuyueController extends UserBaseController
302 295
303 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find(); 296 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
304 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find(); 297 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
305 - $msg = "您好！您已成功预约：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】"; 298 + $msg = "您好！您已成功预约：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，请按时上课，教练电话：{$tea_info['mobile']}，如有问题可直接与教练或您的学车顾问进行联系。【悠乐驾】";
306 $tool->get_sms_code_p($stu_info['mobile'], $msg); 299 $tool->get_sms_code_p($stu_info['mobile'], $msg);
307 - $msg1 = "您好！您的：{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】"; 300 + $msg1 = "您好！您的：{$data['yuyue_day']}/{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员预约，请按时上课，学员电话：{$stu_info['mobile']}【悠乐驾】";
308 $tool->get_sms_code_p($tea_info['mobile'], $msg1); 301 $tool->get_sms_code_p($tea_info['mobile'], $msg1);
309 $param1 = [ 302 $param1 = [
310 'touser' => $stu_info['openid'], 303 'touser' => $stu_info['openid'],
311 'topcolor' => '#7B68EE', 304 'topcolor' => '#7B68EE',
312 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue', 305 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
313 - 'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo', 306 + 'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
314 'data' => array( 307 'data' => array(
315 - 'first' => array('value' => '学车预约通知'),  
316 - 'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),  
317 - 'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),  
318 - 'keyword3' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),  
319 - 'keyword4' => array('value' => $tea_info['mobile']),  
320 - 'keyword5' => array('value' => '无', 'color' => '#0099FF') 308 + 'first' => array('value' => '您的预约成功啦'),
  309 + 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
  310 + 'keyword2' => array('value' => $stu_info['mobile']),
  311 + 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  312 + 'keyword4' => array('value' => $tea_info['user_nickname']),
  313 + 'remark' => array('value' => "点击查看预约")
321 ) 314 )
322 ]; 315 ];
323 $param2 = [ 316 $param2 = [
324 'touser' => $tea_info['openid'], 317 'touser' => $tea_info['openid'],
325 'topcolor' => '#7B68EE', 318 'topcolor' => '#7B68EE',
326 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue', 319 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
327 - 'template_id' => 'kmRG7k7OOLd3m5a3sTvvMknbIySIifBtptFPxs3lgUo', 320 + 'template_id' => 'Ei5jEwFCIe-tS2hatyRRLDkklA2e3prk85rpTx2JBfE',
328 'data' => array( 321 'data' => array(
329 - 'first' => array('value' => '学车预约通知'),  
330 - 'keyword1' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),  
331 - 'keyword2' => array('value' => $stu_info['kemu'], 'color' => '#0099FF'),  
332 - 'keyword3' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),  
333 - 'keyword4' => array('value' => $stu_info['mobile']),  
334 - 'keyword5' => array('value' => '无', 'color' => '#0099FF') 322 + 'first' => array('value' => '有新的学员预约啦'),
  323 + 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
  324 + 'keyword2' => array('value' => $stu_info['mobile']),
  325 + 'keyword3' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  326 + 'keyword4' => array('value' => $tea_info['user_nickname']),
  327 + 'remark' => array('value' => "点击查看预约并确认预约")
335 ) 328 )
336 ]; 329 ];
337 330
@@ -436,55 +429,46 @@ class YuyueController extends UserBaseController @@ -436,55 +429,46 @@ class YuyueController extends UserBaseController
436 $data = Db::name('yuyue') 429 $data = Db::name('yuyue')
437 ->alias('yy') 430 ->alias('yy')
438 ->join('qnb_user u', 'u.id=yy.uid') 431 ->join('qnb_user u', 'u.id=yy.uid')
439 - ->join('order o', 'o.uid=yy.uid')  
440 - ->join('goods g', 'g.id=o.gid')  
441 ->where(['teach_id' => $id]) 432 ->where(['teach_id' => $id])
442 - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') 433 + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
443 ->order('create_time desc') 434 ->order('create_time desc')
444 ->select() 435 ->select()
445 ->toArray(); 436 ->toArray();
446 437
  438 +
447 $data1 = Db::name('yuyue') 439 $data1 = Db::name('yuyue')
448 ->alias('yy') 440 ->alias('yy')
449 ->join('qnb_user u', 'u.id=yy.uid') 441 ->join('qnb_user u', 'u.id=yy.uid')
450 - ->join('order o', 'o.uid=yy.uid')  
451 - ->join('goods g', 'g.id=o.gid')  
452 ->where(['teach_id' => $id]) 442 ->where(['teach_id' => $id])
453 ->where(['yy.status' => '1']) 443 ->where(['yy.status' => '1'])
454 - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') 444 + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
455 ->order('create_time desc') 445 ->order('create_time desc')
456 ->select() 446 ->select()
457 ->toArray(); 447 ->toArray();
458 $data2 = Db::name('yuyue') 448 $data2 = Db::name('yuyue')
459 ->alias('yy') 449 ->alias('yy')
460 ->join('qnb_user u', 'u.id=yy.uid') 450 ->join('qnb_user u', 'u.id=yy.uid')
461 - ->join('order o', 'o.uid=yy.uid')  
462 - ->join('goods g', 'g.id=o.gid')  
463 ->where(['teach_id' => $id]) 451 ->where(['teach_id' => $id])
464 ->where(['yy.status' => '4']) 452 ->where(['yy.status' => '4'])
465 - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') 453 + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
466 ->order('create_time desc') 454 ->order('create_time desc')
467 ->select() 455 ->select()
468 ->toArray(); 456 ->toArray();
469 $data3 = Db::name('yuyue') 457 $data3 = Db::name('yuyue')
470 ->alias('yy') 458 ->alias('yy')
471 ->join('qnb_user u', 'u.id=yy.uid') 459 ->join('qnb_user u', 'u.id=yy.uid')
472 - ->join('order o', 'o.uid=yy.uid')  
473 - ->join('goods g', 'g.id=o.gid')  
474 ->where(['teach_id' => $id]) 460 ->where(['teach_id' => $id])
475 ->where(['yy.status' => '2']) 461 ->where(['yy.status' => '2'])
476 - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') 462 + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
477 ->order('create_time desc') 463 ->order('create_time desc')
478 ->select() 464 ->select()
479 ->toArray(); 465 ->toArray();
480 $data4 = Db::name('yuyue') 466 $data4 = Db::name('yuyue')
481 ->alias('yy') 467 ->alias('yy')
482 ->join('qnb_user u', 'u.id=yy.uid') 468 ->join('qnb_user u', 'u.id=yy.uid')
483 - ->join('order o', 'o.uid=yy.uid')  
484 - ->join('goods g', 'g.id=o.gid')  
485 ->where(['teach_id' => $id]) 469 ->where(['teach_id' => $id])
486 ->where(['yy.status' => '3']) 470 ->where(['yy.status' => '3'])
487 - ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,g.name as gname') 471 + ->field('yy.*,u.user_nickname,u.headimgurl,u.id as tech_id,u.kemu as gname')
488 ->order('create_time desc') 472 ->order('create_time desc')
489 ->select() 473 ->select()
490 ->toArray(); 474 ->toArray();
@@ -521,11 +505,42 @@ class YuyueController extends UserBaseController @@ -521,11 +505,42 @@ class YuyueController extends UserBaseController
521 if ($rres) { 505 if ($rres) {
522 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find(); 506 $stu_info = Db::name('user')->where(['id' => $data['uid']])->find();
523 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find(); 507 $tea_info = Db::name('user')->where(['id' => $data['teach_id']])->find();
524 - $msg = "您好！您已成功取消：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】"; 508 +
  509 +
  510 + $msg = "您好！您已成功取消：{$data['yuyue_day']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段{$tea_info['user_nickname']}的课程，欢迎您再次预约。【悠乐驾】";
525 $tool->get_sms_code_p($stu_info['mobile'], $msg); 511 $tool->get_sms_code_p($stu_info['mobile'], $msg);
526 - $msg1 = "您好！您的：{$data['yuyue_day1']}--{$data['yuyue_hour1']}时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。 512 + $msg1 = "您好！您的：{$data['yuyue_day']}--{$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 时间段课程已被{$stu_info['user_nickname']}学员取消，该时间段将进入待预约状态。
527 【悠乐驾】"; 513 【悠乐驾】";
528 $tool->get_sms_code_p($tea_info['mobile'], $msg1); 514 $tool->get_sms_code_p($tea_info['mobile'], $msg1);
  515 +
  516 + $param1 = [
  517 + 'touser' => $stu_info['openid'],
  518 + 'topcolor' => '#7B68EE',
  519 + 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
  520 + 'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
  521 + 'data' => array(
  522 + 'first' => array('value' => '您的预约已取消'),
  523 + 'keyword1' => array('value' => $tea_info['user_nickname'], 'color' => '#0099FF'),
  524 + 'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  525 + 'remark' => array('value' => "谢谢使用")
  526 + )
  527 + ];
  528 + $param2 = [
  529 + 'touser' => $tea_info['openid'],
  530 + 'topcolor' => '#7B68EE',
  531 + 'url' => 'http://wx.youlj.cn/user/yuyue/my_yuyue',
  532 + 'template_id' => 'u4uRiWRnlZb8xQ4mbInvtv5AiVxPJZ13mpYQxZh7P0o',
  533 + 'data' => array(
  534 + 'first' => array('value' => '您的预约已取消'),
  535 + 'keyword1' => array('value' => $stu_info['user_nickname'], 'color' => '#0099FF'),
  536 + 'keyword2' => array('value' => "{$data['yuyue_day']} {$data['yuyue_begin']}:00 - {$data['yuyue_end']}:00 ", 'color' => '#333366'),
  537 + 'remark' => array('value' => "谢谢使用")
  538 + )
  539 + ];
  540 +
  541 + $res = $tool->wxtemsg_send($param1);
  542 + $res = $tool->wxtemsg_send($param2);
  543 +
529 return json(['code' => '1', 'msg' => '删除成功']); 544 return json(['code' => '1', 'msg' => '删除成功']);
530 } else { 545 } else {
531 return json(['code' => '0', 'msg' => '抱歉，删除失败']); 546 return json(['code' => '0', 'msg' => '抱歉，删除失败']);
@@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
10 // [ 入口文件 ] 10 // [ 入口文件 ]
11 date_default_timezone_set('Asia/Shanghai'); 11 date_default_timezone_set('Asia/Shanghai');
12 // 调试模式开关 12 // 调试模式开关
13 -define("APP_DEBUG", false); 13 +define("APP_DEBUG", 1);
14 14
15 // 定义CMF根目录,可更改此目录 15 // 定义CMF根目录,可更改此目录
16 define('CMF_ROOT', __DIR__ . '/../'); 16 define('CMF_ROOT', __DIR__ . '/../');
@@ -82,7 +82,7 @@ try { @@ -82,7 +82,7 @@ try {
82 WeixinJSBridge.log(res.err_msg); 82 WeixinJSBridge.log(res.err_msg);
83 //alert(res.err_code); 83 //alert(res.err_code);
84 if (res.err_msg == 'get_brand_wcpay_request:ok') { 84 if (res.err_msg == 'get_brand_wcpay_request:ok') {
85 - window.location.href = 'http://wx.youlj.cn/user/order/pay_success.html'; 85 + window.location.href = 'http://wx.youlj.cn/portal/index/pay_success.html';
86 } else if (res.err_msg == 'get_brand_wcpay_request:cancel') { 86 } else if (res.err_msg == 'get_brand_wcpay_request:cancel') {
87 window.history.go(-1); 87 window.history.go(-1);
88 } 88 }
@@ -48,8 +48,8 @@ @@ -48,8 +48,8 @@
48 <td><b>{$vo.id}</b></td> 48 <td><b>{$vo.id}</b></td>
49 <td>{$vo.user_nickname}</td> 49 <td>{$vo.user_nickname}</td>
50 <td>{$vo.uid|id_name}</td> 50 <td>{$vo.uid|id_name}</td>
51 - <td>{$vo.yuyue_day1}</td>  
52 - <td>{$vo.yuyue_hour1}</td> 51 + <td>{$vo.yuyue_day}</td>
  52 + <td>{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</td>
53 <td> 53 <td>
54 <notempty name="vo.create_time"> 54 <notempty name="vo.create_time">
55 {:date('Y-m-d H:i',$vo['create_time'])} 55 {:date('Y-m-d H:i',$vo['create_time'])}
@@ -36,7 +36,7 @@ @@ -36,7 +36,7 @@
36 </li> 36 </li>
37 <li> 37 <li>
38 <b>年龄</b> 38 <b>年龄</b>
39 - <i>{$data.birthday|birthday_name}</i> 39 + <i>{$data.birthday}</i>
40 </li> 40 </li>
41 <li> 41 <li>
42 <b>身份证</b> 42 <b>身份证</b>
@@ -12,8 +12,18 @@ @@ -12,8 +12,18 @@
12 <link rel="stylesheet" href="/static/css/style.css"> 12 <link rel="stylesheet" href="/static/css/style.css">
13 <style> 13 <style>
14 .title_bm { 14 .title_bm {
15 - margin-top: 15.1vh;  
16 - font-size: .36rem; 15 + position: fixed;
  16 + top: 4.5%;
  17 + left: 0;
  18 + width: 100%;
  19 + }
  20 +
  21 + .bm_list {
  22 + margin-top: 5.5rem;
  23 + }
  24 +
  25 + .title_bm p {
  26 + text-align: center;
17 } 27 }
18 </style> 28 </style>
19 </head> 29 </head>
@@ -244,10 +244,9 @@ @@ -244,10 +244,9 @@
244 }, 244 },
245 success: function (data) { 245 success: function (data) {
246 if (data.code == '1') { 246 if (data.code == '1') {
247 - // alert("成功");  
248 window.location.href = "{:url('portal/index/confirm_order',['gid'=>$gid])}"; 247 window.location.href = "{:url('portal/index/confirm_order',['gid'=>$gid])}";
249 } else { 248 } else {
250 - alert(data.msg); 249 + layer.msg(data.msg);
251 } 250 }
252 } 251 }
253 }) 252 })
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6 <meta content="yes" name="apple-mobile-web-app-capable"> 6 <meta content="yes" name="apple-mobile-web-app-capable">
7 <meta content="yes" name="apple-touch-fullscreen"> 7 <meta content="yes" name="apple-touch-fullscreen">
8 - <meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no"> 8 + <meta name="viewport"
  9 + content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
9 <title>登录</title> 10 <title>登录</title>
10 <link rel="stylesheet" href="/static/css/common.css"> 11 <link rel="stylesheet" href="/static/css/common.css">
11 <link rel="stylesheet" href="/static/css/style.css"> 12 <link rel="stylesheet" href="/static/css/style.css">
@@ -27,7 +28,7 @@ @@ -27,7 +28,7 @@
27 <i>抱歉，此手机号没有权限登录</i> 28 <i>抱歉，此手机号没有权限登录</i>
28 </div> 29 </div>
29 <div class="btn_login"> 30 <div class="btn_login">
30 - <img src="/static/image/btn_login.png" /> 31 + <img src="/static/image/btn_login.png"/>
31 </div> 32 </div>
32 </div> 33 </div>
33 34
@@ -38,72 +39,65 @@ @@ -38,72 +39,65 @@
38 <script> 39 <script>
39 $(function () { 40 $(function () {
40 //获取短信验证码 41 //获取短信验证码
41 - var times = 1;  
42 - var validCode=true;  
43 - $(".get_code").click (function () {  
44 - if(validCode){  
45 - var user_phone=$(".login_phone").val();  
46 - console.log(user_phone);  
47 - if(!user_phone){ 42 + var validCode = true;
  43 + $(".get_code").click(function () {
  44 + if (validCode) {
  45 + var user_phone = $(".login_phone").val();
  46 + if (!user_phone) {
48 layer.msg("手机号码格式不正确") 47 layer.msg("手机号码格式不正确")
49 - }else{  
50 - if(times ==1){  
51 - times++; 48 + } else {
52 $.ajax({ 49 $.ajax({
53 - type:"post",  
54 - url:"{:url('portal/tool/get_sms_code')}",  
55 - data:{  
56 - mobile:user_phone 50 + type: "post",
  51 + url: "{:url('portal/tool/get_sms_code')}",
  52 + data: {
  53 + mobile: user_phone
57 }, 54 },
58 - success:function(){  
59 - var time=60;  
60 - var code=$(".get_code"); 55 + success: function () {
  56 + var time = 60;
  57 + var code = $(".get_code");
61 if (validCode) { 58 if (validCode) {
62 code.html("60秒"); 59 code.html("60秒");
63 - validCode=false; 60 + validCode = false;
64 code.addClass("msgs1"); 61 code.addClass("msgs1");
65 - var t=setInterval(function () {  
66 - if (time>=0) { 62 + var t = setInterval(function () {
  63 + if (time > 0) {
67 time--; 64 time--;
68 - code.html(time+"秒");  
69 - validCode=false;  
70 - } else{  
71 - validCode =true; 65 + code.html(time + "秒");
  66 + validCode = false;
  67 + } else {
72 code.html("重新获取"); 68 code.html("重新获取");
73 clearInterval(t); 69 clearInterval(t);
  70 + validCode = true;
74 } 71 }
75 - },1000) 72 + }, 1000)
76 } 73 }
77 } 74 }
78 }) 75 })
79 } 76 }
80 } 77 }
81 - }  
82 }); 78 });
83 79
84 - $('.btn_login').click(function(){  
85 - var user_phone=$(".login_phone").val();  
86 - var user_code=$('.login_code').val();  
87 - if(!user_code){ 80 + $('.btn_login').click(function () {
  81 + var user_phone = $(".login_phone").val();
  82 + var user_code = $('.login_code').val();
  83 + if (!user_code) {
88 layer.msg("验证码不能为空") 84 layer.msg("验证码不能为空")
89 - }else{ 85 + } else {
90 $.ajax({ 86 $.ajax({
91 - type:"post",  
92 - url:"{:url('user/login/do_login')}",  
93 - data:{  
94 - mobile:user_phone,  
95 - sms_code:user_code 87 + type: "post",
  88 + url: "{:url('user/login/do_login')}",
  89 + data: {
  90 + mobile: user_phone,
  91 + sms_code: user_code
96 }, 92 },
97 - success:function(res){  
98 - if(res.code==0){  
99 - $('.login_tab i').text(res.msg);  
100 - $('.login_tab').show();  
101 - }else {  
102 - window.location.href="{:url('user/profile/percenter')}" 93 + success: function (res) {
  94 + if (res.code == 0) {
  95 + layer.msg(res.msg);
  96 + } else {
  97 + window.location.href = "{:url('user/profile/percenter')}"
103 } 98 }
104 - console.log(res);  
105 }, 99 },
106 - error:function(){ 100 + error: function () {
107 101
108 } 102 }
109 }) 103 })
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <meta content="yes" name="apple-mobile-web-app-capable"> 6 <meta content="yes" name="apple-mobile-web-app-capable">
7 <meta content="yes" name="apple-touch-fullscreen"> 7 <meta content="yes" name="apple-touch-fullscreen">
8 <meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no"> 8 <meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
9 - <title>手动挡C1学车</title> 9 + <title>{$data.name}</title>
10 <link rel="stylesheet" href="/static/css/common.css"> 10 <link rel="stylesheet" href="/static/css/common.css">
11 <link rel="stylesheet" href="/static/css/style.css"> 11 <link rel="stylesheet" href="/static/css/style.css">
12 </head> 12 </head>
@@ -5,7 +5,8 @@ @@ -5,7 +5,8 @@
5 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
6 <meta content="yes" name="apple-mobile-web-app-capable"> 6 <meta content="yes" name="apple-mobile-web-app-capable">
7 <meta content="yes" name="apple-touch-fullscreen"> 7 <meta content="yes" name="apple-touch-fullscreen">
8 - <meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no"> 8 + <meta name="viewport"
  9 + content="width=device-width, initial-scale=1,maximum-scale=1,maximum-scale=1, minimum-scale=1, user-scalable=no">
9 <title>我的预约</title> 10 <title>我的预约</title>
10 <link rel="stylesheet" href="/static/css/common.css"> 11 <link rel="stylesheet" href="/static/css/common.css">
11 <link rel="stylesheet" href="/static/css/style.css"> 12 <link rel="stylesheet" href="/static/css/style.css">
@@ -43,9 +44,9 @@ @@ -43,9 +44,9 @@
43 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}"> 44 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
44 <img src="/static/image/btn_yuyue.png"> 45 <img src="/static/image/btn_yuyue.png">
45 </div> 46 </div>
46 - <else /> 47 + <else/>
47 <volist name="data" id="vo"> 48 <volist name="data" id="vo">
48 - <div class="yuyueList" > 49 + <div class="yuyueList">
49 <div class="yList_top"> 50 <div class="yList_top">
50 <b>{$vo.status|yuyue_status_name}</b> 51 <b>{$vo.status|yuyue_status_name}</b>
51 <i>{$vo.yuyue_day|date_to_date}</i> 52 <i>{$vo.yuyue_day|date_to_date}</i>
@@ -73,16 +74,19 @@ @@ -73,16 +74,19 @@
73 </div> 74 </div>
74 </case> 75 </case>
75 <case value="2"> 76 <case value="2">
76 - <div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>$vo['teach_id'],'yuyue_id'=>$vo['id']))}"> 77 + <div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>
  78 + $vo['teach_id'],'yuyue_id'=>$vo['id']))}">
77 <b class="click_yuyue">去评价</b> 79 <b class="click_yuyue">去评价</b>
78 </div> 80 </div>
79 </case> 81 </case>
80 <case value="3"> 82 <case value="3">
81 - <div class="yuyue_btn" onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>$vo['id']))}"> 83 + <div class="yuyue_btn"
  84 + onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>
  85 + $vo['id']))}">
82 <b class="click_yuyue">查看评价</b> 86 <b class="click_yuyue">查看评价</b>
83 </div> 87 </div>
84 </case> 88 </case>
85 - <default /> 89 + <default/>
86 </switch> 90 </switch>
87 91
88 92
@@ -100,7 +104,7 @@ @@ -100,7 +104,7 @@
100 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}"> 104 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
101 <img src="/static/image/btn_yuyue.png"> 105 <img src="/static/image/btn_yuyue.png">
102 </div> 106 </div>
103 - <else /> 107 + <else/>
104 <volist name="dxdata" id="vo"> 108 <volist name="dxdata" id="vo">
105 <div class="yuyueList"> 109 <div class="yuyueList">
106 <div class="yList_top"> 110 <div class="yList_top">
@@ -135,7 +139,7 @@ @@ -135,7 +139,7 @@
135 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}"> 139 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
136 <img src="/static/image/btn_yuyue.png"> 140 <img src="/static/image/btn_yuyue.png">
137 </div> 141 </div>
138 - <else /> 142 + <else/>
139 <volist name="dpdata" id="vo"> 143 <volist name="dpdata" id="vo">
140 <div class="yuyueList"> 144 <div class="yuyueList">
141 <div class="yList_top"> 145 <div class="yList_top">
@@ -153,7 +157,8 @@ @@ -153,7 +157,8 @@
153 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i> 157 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i>
154 </div> 158 </div>
155 </div> 159 </div>
156 - <div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>$vo['teach_id'],'yuyue_id'=>$vo['id']))}"> 160 + <div class="yuyue_btn" onclick=location.href="{:url('user/comment/index',array('id'=>
  161 + $vo['teach_id'],'yuyue_id'=>$vo['id']))}">
157 <b class="click_yuyue">去评价</b> 162 <b class="click_yuyue">去评价</b>
158 </div> 163 </div>
159 </div> 164 </div>
@@ -170,7 +175,7 @@ @@ -170,7 +175,7 @@
170 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}"> 175 <div class="btn_yuyue" onclick=location.href="{:url('user/yuyue/index')}">
171 <img src="/static/image/btn_yuyue.png"> 176 <img src="/static/image/btn_yuyue.png">
172 </div> 177 </div>
173 - <else /> 178 + <else/>
174 <volist name="ypdata" id="vo"> 179 <volist name="ypdata" id="vo">
175 <div class="yuyueList"> 180 <div class="yuyueList">
176 <div class="yList_top"> 181 <div class="yList_top">
@@ -188,7 +193,8 @@ @@ -188,7 +193,8 @@
188 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i> 193 <i class="yu_times">{$vo.yuyue_begin}:00 - {$vo.yuyue_end}:00</i>
189 </div> 194 </div>
190 </div> 195 </div>
191 - <div class="yuyue_btn" onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>$vo['id']))}"> 196 + <div class="yuyue_btn" onclick=location.href="{:url('user/comment/show_stu',array('yuyue_id'=>
  197 + $vo['id']))}">
192 <b class="click_yuyue">查看评价</b> 198 <b class="click_yuyue">查看评价</b>
193 </div> 199 </div>
194 </div> 200 </div>
@@ -214,50 +220,53 @@ @@ -214,50 +220,53 @@
214 <script type="text/javascript" src="/static/js/common.js"></script> 220 <script type="text/javascript" src="/static/js/common.js"></script>
215 <script type="text/javascript" src="/static/js/study_car.js"></script> 221 <script type="text/javascript" src="/static/js/study_car.js"></script>
216 <script> 222 <script>
217 - $(function(){  
218 - $('.yList_top').each(function(){  
219 - var colorHtml=$(this).children('b').html();  
220 - if(colorHtml=="待学车"){  
221 - $(this).children('b').css("color","#53a6fa"); 223 + $(function () {
  224 + $('.yList_top').each(function () {
  225 + var colorHtml = $(this).children('b').html();
  226 + if (colorHtml == "待学车") {
  227 + $(this).children('b').css("color", "#53a6fa");
222 } 228 }
223 }); 229 });
224 - $('.click_yuyue').click(function(){  
225 - var id=$(this).attr("data-id");  
226 - var cancel_fa=$(this).parent().parent();  
227 - var con_text=$(this).html().trim();  
228 - if(con_text=="取消预约"){  
229 - var yu_day=$(this).parent().prev().prev().find('i').text();  
230 - var yu_times=$(this).parent().prev().find('.yu_times').text().split('-')[0];  
231 - var yuTime=new Date(yu_day+' '+yu_times).getTime();  
232 - var two_hour = 12*3600*1000;  
233 - var date=new Date().getTime();  
234 - if(yuTime-date<=two_hour){  
235 - $('.tan_car').attr("src","/static/image/tan_car2.png");  
236 - $('.tan_car').css({"width":"4.97rem","height":"2.88rem"}); 230 + $('.click_yuyue').click(function () {
  231 + var id = $(this).attr("data-id");
  232 + var cancel_fa = $(this).parent().parent();
  233 + var con_text = $(this).html().trim();
  234 + if (con_text == "取消预约") {
  235 + var yu_day = $(this).parent().prev().prev().find('i').text();
  236 + var yu_times = $(this).parent().prev().find('.yu_times').text().split('-')[0];
  237 + var yuTime = new Date(yu_day + ' ' + yu_times).getTime();
  238 + var two_hour = 12 * 3600 * 1000;
  239 + var date = new Date().getTime();
  240 + if (yuTime - date <= two_hour) {
  241 + $('.tan_car').attr("src", "/static/image/tan_car2.png");
  242 + $('.tan_car').css({"width": "4.97rem", "height": "2.88rem"});
237 $('.tan_text').html("抱歉，已过取消预约时间无法取消"); 243 $('.tan_text').html("抱歉，已过取消预约时间无法取消");
238 tankuang(); 244 tankuang();
239 - $('.btn_qr').click(function() { 245 + $('.btn_qr').click(function () {
240 $("html").css("overflow", "auto"); 246 $("html").css("overflow", "auto");
241 $("body").css("overflow", "auto"); 247 $("body").css("overflow", "auto");
242 $(".full_bg").hide(); 248 $(".full_bg").hide();
243 $(".yu_tan").hide(); 249 $(".yu_tan").hide();
244 }); 250 });
245 - }else{ 251 + } else {
246 tankuang(); 252 tankuang();
247 - $('.btn_qr').click(function(){  
248 - $("html").css("overflow","auto");  
249 - $("body").css("overflow","auto"); 253 + $('.btn_qr').click(function () {
  254 + $("html").css("overflow", "auto");
  255 + $("body").css("overflow", "auto");
250 $(".full_bg").hide(); 256 $(".full_bg").hide();
251 $(".yu_tan").hide(); 257 $(".yu_tan").hide();
252 $.ajax({ 258 $.ajax({
253 - url:"{:url('redo')}",  
254 - type:"post",  
255 - data:{  
256 - id:id  
257 - },success:function (res) {  
258 - if(res.code==1){ 259 + url: "{:url('redo')}",
  260 + type: "post",
  261 + data: {
  262 + id: id
  263 + }, success: function (res) {
  264 + if (res.code == 1) {
259 cancel_fa.remove(); 265 cancel_fa.remove();
  266 + layer.msg("取消预约成功");
  267 + setTimeout(function () {
260 window.history.go(0); 268 window.history.go(0);
  269 + }, 1500);
261 } 270 }
262 } 271 }
263 }) 272 })
@@ -266,24 +275,25 @@ @@ -266,24 +275,25 @@
266 } 275 }
267 }); 276 });
268 }); 277 });
269 - $(function(){  
270 - function get(url/*后台的地址*/,obj/*后台需要的数据*/){  
271 - var promise = new Promise(function(resolve, reject){ 278 + $(function () {
  279 + function get(url/*后台的地址*/, obj/*后台需要的数据*/) {
  280 + var promise = new Promise(function (resolve, reject) {
272 $.ajax({ 281 $.ajax({
273 - url:url,  
274 - data:obj,  
275 - success:function(res){ 282 + url: url,
  283 + data: obj,
  284 + success: function (res) {
276 resolve(res); 285 resolve(res);
277 }, 286 },
278 - failure:function(err){ 287 + failure: function (err) {
279 reject(err); 288 reject(err);
280 } 289 }
281 }) 290 })
282 });//等一下发嗯 291 });//等一下发嗯
283 return promise; 292 return promise;
284 } 293 }
285 - var $div_li =$(".yuyueMenu ul li");  
286 - $div_li.click(function(){ 294 +
  295 + var $div_li = $(".yuyueMenu ul li");
  296 + $div_li.click(function () {
287 $(this).addClass("yuyue_cur") 297 $(this).addClass("yuyue_cur")
288 .siblings().removeClass("yuyue_cur"); 298 .siblings().removeClass("yuyue_cur");
289 var index = $div_li.index(this); 299 var index = $div_li.index(this);
@@ -10,11 +10,24 @@ @@ -10,11 +10,24 @@
10 // +---------------------------------------------------------------------- 10 // +----------------------------------------------------------------------
11 namespace cmf\controller; 11 namespace cmf\controller;
12 12
  13 +use think\Db;
  14 +
13 class UserBaseController extends HomeBaseController 15 class UserBaseController extends HomeBaseController
14 { 16 {
15 17
16 public function _initialize() 18 public function _initialize()
17 { 19 {
  20 + if(session('user.id')){
  21 + $login_info = Db::name('user')->where(['id'=>session('user.id')])->find();
  22 +
  23 + if(!$login_info){
  24 + session('user.id',null);
  25 +
  26 + header("location:/user/profile/percenter");
  27 + }
  28 + }
  29 +
  30 +
18 parent::_initialize(); 31 parent::_initialize();
19 $this->checkUserLogin(); 32 $this->checkUserLogin();
20 } 33 }