外包项目 / signUpForCar · 提交

转到一个项目

作者 654550265
提交 996779f4836e1e302124fc3d855507fe5fc83520 2 个父辈 0dd037ed 5fea6dfa

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 140 行增加 和 97 行删除
@@ -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/admin/controller/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/UserController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.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" />
@@ -42,69 +42,50 @@ @@ -42,69 +42,50 @@
42 </provider> 42 </provider>
43 </entry> 43 </entry>
44 </file> 44 </file>
45 - <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">  
46 - <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php"> 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">
47 <provider selected="true" editor-type-id="text-editor"> 47 <provider selected="true" editor-type-id="text-editor">
48 - <state relative-caret-position="273">  
49 - <caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" /> 48 + <state relative-caret-position="468">
  49 + <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
50 </state> 50 </state>
51 </provider> 51 </provider>
52 </entry> 52 </entry>
53 </file> 53 </file>
54 - <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">  
55 - <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php"> 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">
56 <provider selected="true" editor-type-id="text-editor"> 56 <provider selected="true" editor-type-id="text-editor">
57 - <state relative-caret-position="-99">  
58 - <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" /> 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" />
59 </state> 59 </state>
60 </provider> 60 </provider>
61 </entry> 61 </entry>
62 </file> 62 </file>
63 - <file leaf-file-name="ListsController.php" pinned="false" current-in-tab="false">  
64 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php"> 63 + <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
  64 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
65 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
66 - <state relative-caret-position="2440">  
67 - <caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" /> 66 + <state relative-caret-position="2520">
  67 + <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
68 <folding> 68 <folding>
69 - <element signature="e#2713#3721#0#PHP" />  
70 - <element signature="e#5505#6819#0#PHP" /> 69 + <element signature="e#628#666#0#PHP" expanded="true" />
71 </folding> 70 </folding>
72 </state> 71 </state>
73 </provider> 72 </provider>
74 </entry> 73 </entry>
75 </file> 74 </file>
76 - <file leaf-file-name="RegController.php" pinned="false" current-in-tab="false">  
77 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php">  
78 - <provider selected="true" editor-type-id="text-editor">  
79 - <state relative-caret-position="126">  
80 - <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />  
81 - </state>  
82 - </provider>  
83 - </entry>  
84 - </file>  
85 - <file leaf-file-name="student.html" pinned="false" current-in-tab="false">  
86 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">  
87 - <provider selected="true" editor-type-id="text-editor">  
88 - <state relative-caret-position="468">  
89 - <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />  
90 - </state>  
91 - </provider>  
92 - </entry>  
93 - </file>  
94 - <file leaf-file-name="RegController [2].php" pinned="false" current-in-tab="false">  
95 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php"> 75 + <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
  76 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
96 <provider selected="true" editor-type-id="text-editor"> 77 <provider selected="true" editor-type-id="text-editor">
97 - <state relative-caret-position="279">  
98 - <caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" /> 78 + <state relative-caret-position="273">
  79 + <caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
99 </state> 80 </state>
100 </provider> 81 </provider>
101 </entry> 82 </entry>
102 </file> 83 </file>
103 - <file leaf-file-name="ProfileController [2].php" pinned="false" current-in-tab="false">  
104 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [2].php"> 84 + <file leaf-file-name="confirm_order.html" pinned="false" current-in-tab="false">
  85 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
105 <provider selected="true" editor-type-id="text-editor"> 86 <provider selected="true" editor-type-id="text-editor">
106 - <state relative-caret-position="567">  
107 - <caret line="214" column="50" lean-forward="true" selection-start-line="214" selection-start-column="50" selection-end-line="214" selection-end-column="50" /> 87 + <state relative-caret-position="357">
  88 + <caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
108 </state> 89 </state>
109 </provider> 90 </provider>
110 </entry> 91 </entry>
@@ -167,13 +148,14 @@ @@ -167,13 +148,14 @@
167 <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" /> 148 <option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
168 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 149 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
169 <option value="$PROJECT_DIR$/public/index.php" /> 150 <option value="$PROJECT_DIR$/public/index.php" />
170 - <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />  
171 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" /> 151 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" />
172 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" /> 152 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
173 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php" /> 153 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php" />
174 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html" /> 154 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html" />
175 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" /> 155 <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
176 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" /> 156 <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
  157 + <option value="$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html" />
  158 + <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
177 </list> 159 </list>
178 </option> 160 </option>
179 </component> 161 </component>
@@ -232,13 +214,13 @@ @@ -232,13 +214,13 @@
232 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 214 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
233 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 215 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
234 <item name="app" type="462c0819:PsiDirectoryNode" /> 216 <item name="app" type="462c0819:PsiDirectoryNode" />
235 - <item name="admin" type="462c0819:PsiDirectoryNode" /> 217 + <item name="portal" type="462c0819:PsiDirectoryNode" />
236 </path> 218 </path>
237 <path> 219 <path>
238 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 220 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
239 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 221 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
240 <item name="app" type="462c0819:PsiDirectoryNode" /> 222 <item name="app" type="462c0819:PsiDirectoryNode" />
241 - <item name="admin" type="462c0819:PsiDirectoryNode" /> 223 + <item name="portal" type="462c0819:PsiDirectoryNode" />
242 <item name="controller" type="462c0819:PsiDirectoryNode" /> 224 <item name="controller" type="462c0819:PsiDirectoryNode" />
243 </path> 225 </path>
244 <path> 226 <path>
@@ -249,6 +231,36 @@ @@ -249,6 +231,36 @@
249 <path> 231 <path>
250 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 232 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
251 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 233 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  234 + <item name="public" type="462c0819:PsiDirectoryNode" />
  235 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  236 + </path>
  237 + <path>
  238 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  239 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  240 + <item name="public" type="462c0819:PsiDirectoryNode" />
  241 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  242 + <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
  243 + </path>
  244 + <path>
  245 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  246 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  247 + <item name="public" type="462c0819:PsiDirectoryNode" />
  248 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  249 + <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
  250 + <item name="portal" type="462c0819:PsiDirectoryNode" />
  251 + </path>
  252 + <path>
  253 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  254 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  255 + <item name="public" type="462c0819:PsiDirectoryNode" />
  256 + <item name="themes" type="462c0819:PsiDirectoryNode" />
  257 + <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
  258 + <item name="portal" type="462c0819:PsiDirectoryNode" />
  259 + <item name="index" type="462c0819:PsiDirectoryNode" />
  260 + </path>
  261 + <path>
  262 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  263 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
252 <item name="simplewind" type="462c0819:PsiDirectoryNode" /> 264 <item name="simplewind" type="462c0819:PsiDirectoryNode" />
253 </path> 265 </path>
254 <path> 266 <path>
@@ -317,14 +329,7 @@ @@ -317,14 +329,7 @@
317 <workItem from="1535514127808" duration="727000" /> 329 <workItem from="1535514127808" duration="727000" />
318 <workItem from="1535532970259" duration="2527000" /> 330 <workItem from="1535532970259" duration="2527000" />
319 <workItem from="1535546044129" duration="20814000" /> 331 <workItem from="1535546044129" duration="20814000" />
320 - <workItem from="1535633001243" duration="9779000" />  
321 - </task>  
322 - <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">  
323 - <created>1535458170068</created>  
324 - <option name="number" value="00001" />  
325 - <option name="presentableId" value="LOCAL-00001" />  
326 - <option name="project" value="LOCAL" />  
327 - <updated>1535458170068</updated> 332 + <workItem from="1535633001243" duration="11133000" />
328 </task> 333 </task>
329 <task id="LOCAL-00002" summary="修复教练的时间段可以重复预约"> 334 <task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">
330 <created>1535458750848</created> 335 <created>1535458750848</created>
@@ -655,11 +660,25 @@ @@ -655,11 +660,25 @@
655 <option name="project" value="LOCAL" /> 660 <option name="project" value="LOCAL" />
656 <updated>1535640236039</updated> 661 <updated>1535640236039</updated>
657 </task> 662 </task>
658 - <option name="localTasksCounter" value="49" /> 663 + <task id="LOCAL-00049" summary="登录处理">
  664 + <created>1535645567208</created>
  665 + <option name="number" value="00049" />
  666 + <option name="presentableId" value="LOCAL-00049" />
  667 + <option name="project" value="LOCAL" />
  668 + <updated>1535645567208</updated>
  669 + </task>
  670 + <task id="LOCAL-00050" summary="登录处理">
  671 + <created>1535646952275</created>
  672 + <option name="number" value="00050" />
  673 + <option name="presentableId" value="LOCAL-00050" />
  674 + <option name="project" value="LOCAL" />
  675 + <updated>1535646952275</updated>
  676 + </task>
  677 + <option name="localTasksCounter" value="51" />
659 <servers /> 678 <servers />
660 </component> 679 </component>
661 <component name="TimeTrackingManager"> 680 <component name="TimeTrackingManager">
662 - <option name="totallyTimeSpent" value="64231000" /> 681 + <option name="totallyTimeSpent" value="65585000" />
663 </component> 682 </component>
664 <component name="ToolWindowManager"> 683 <component name="ToolWindowManager">
665 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 684 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -686,6 +705,28 @@ @@ -686,6 +705,28 @@
686 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" /> 705 <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
687 <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" /> 706 <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
688 </layout> 707 </layout>
  708 + <layout-to-restore>
  709 + <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
  710 + <window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
  711 + <window_info id="npm" order="2" side_tool="true" />
  712 + <window_info anchor="bottom" id="Run" order="2" />
  713 + <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
  714 + <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
  715 + <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
  716 + <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
  717 + <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
  718 + <window_info anchor="bottom" id="TODO" order="6" />
  719 + <window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
  720 + <window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
  721 + <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
  722 + <window_info anchor="right" id="Database" order="3" />
  723 + <window_info anchor="bottom" id="Terminal" order="9" />
  724 + <window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
  725 + <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
  726 + <window_info anchor="bottom" id="Version Control" order="11" />
  727 + <window_info anchor="bottom" id="Message" order="0" />
  728 + <window_info id="Favorites" order="3" side_tool="true" />
  729 + </layout-to-restore>
689 </component> 730 </component>
690 <component name="TypeScriptGeneratedFilesManager"> 731 <component name="TypeScriptGeneratedFilesManager">
691 <option name="version" value="1" /> 732 <option name="version" value="1" />
@@ -706,13 +747,6 @@ @@ -706,13 +747,6 @@
706 <option name="LAST_COMMIT_MESSAGE" value="登录处理" /> 747 <option name="LAST_COMMIT_MESSAGE" value="登录处理" />
707 </component> 748 </component>
708 <component name="editorHistoryManager"> 749 <component name="editorHistoryManager">
709 - <entry file="file://$PROJECT_DIR$/api/user/model/UserFavoriteModel.php">  
710 - <provider selected="true" editor-type-id="text-editor">  
711 - <state relative-caret-position="1827">  
712 - <caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />  
713 - </state>  
714 - </provider>  
715 - </entry>  
716 <entry file="file://$PROJECT_DIR$/api/user/route.php"> 750 <entry file="file://$PROJECT_DIR$/api/user/route.php">
717 <provider selected="true" editor-type-id="text-editor"> 751 <provider selected="true" editor-type-id="text-editor">
718 <state relative-caret-position="105"> 752 <state relative-caret-position="105">
@@ -924,13 +958,6 @@ @@ -924,13 +958,6 @@
924 </state> 958 </state>
925 </provider> 959 </provider>
926 </entry> 960 </entry>
927 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">  
928 - <provider selected="true" editor-type-id="text-editor">  
929 - <state relative-caret-position="105">  
930 - <caret line="13" selection-start-line="13" selection-end-line="13" selection-end-column="13" />  
931 - </state>  
932 - </provider>  
933 - </entry>  
934 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php"> 961 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
935 <provider selected="true" editor-type-id="text-editor"> 962 <provider selected="true" editor-type-id="text-editor">
936 <state relative-caret-position="420"> 963 <state relative-caret-position="420">
@@ -948,13 +975,6 @@ @@ -948,13 +975,6 @@
948 </state> 975 </state>
949 </provider> 976 </provider>
950 </entry> 977 </entry>
951 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">  
952 - <provider selected="true" editor-type-id="text-editor">  
953 - <state relative-caret-position="315">  
954 - <caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />  
955 - </state>  
956 - </provider>  
957 - </entry>  
958 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php"> 978 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
959 <provider selected="true" editor-type-id="text-editor"> 979 <provider selected="true" editor-type-id="text-editor">
960 <state relative-caret-position="-99" /> 980 <state relative-caret-position="-99" />
@@ -967,20 +987,6 @@ @@ -967,20 +987,6 @@
967 </state> 987 </state>
968 </provider> 988 </provider>
969 </entry> 989 </entry>
970 - <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">  
971 - <provider selected="true" editor-type-id="text-editor">  
972 - <state relative-caret-position="534">  
973 - <caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />  
974 - </state>  
975 - </provider>  
976 - </entry>  
977 - <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">  
978 - <provider selected="true" editor-type-id="text-editor">  
979 - <state relative-caret-position="-99">  
980 - <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />  
981 - </state>  
982 - </provider>  
983 - </entry>  
984 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php"> 990 <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
985 <provider selected="true" editor-type-id="text-editor"> 991 <provider selected="true" editor-type-id="text-editor">
986 <state relative-caret-position="2440"> 992 <state relative-caret-position="2440">
@@ -1006,10 +1012,24 @@ @@ -1006,10 +1012,24 @@
1006 </state> 1012 </state>
1007 </provider> 1013 </provider>
1008 </entry> 1014 </entry>
1009 - <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php"> 1015 + <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
1010 <provider selected="true" editor-type-id="text-editor"> 1016 <provider selected="true" editor-type-id="text-editor">
1011 - <state relative-caret-position="279">  
1012 - <caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" /> 1017 + <state relative-caret-position="273">
  1018 + <caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
  1019 + </state>
  1020 + </provider>
  1021 + </entry>
  1022 + <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
  1023 + <provider selected="true" editor-type-id="text-editor">
  1024 + <state relative-caret-position="-99">
  1025 + <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
  1026 + </state>
  1027 + </provider>
  1028 + </entry>
  1029 + <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
  1030 + <provider selected="true" editor-type-id="text-editor">
  1031 + <state relative-caret-position="534">
  1032 + <caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
1013 </state> 1033 </state>
1014 </provider> 1034 </provider>
1015 </entry> 1035 </entry>
@@ -1020,10 +1040,34 @@ @@ -1020,10 +1040,34 @@
1020 </state> 1040 </state>
1021 </provider> 1041 </provider>
1022 </entry> 1042 </entry>
1023 - <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php"> 1043 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
  1044 + <provider selected="true" editor-type-id="text-editor">
  1045 + <state relative-caret-position="279">
  1046 + <caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
  1047 + </state>
  1048 + </provider>
  1049 + </entry>
  1050 + <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
  1051 + <provider selected="true" editor-type-id="text-editor">
  1052 + <state relative-caret-position="357">
  1053 + <caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
  1054 + </state>
  1055 + </provider>
  1056 + </entry>
  1057 + <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
  1058 + <provider selected="true" editor-type-id="text-editor">
  1059 + <state relative-caret-position="2520">
  1060 + <caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
  1061 + <folding>
  1062 + <element signature="e#628#666#0#PHP" expanded="true" />
  1063 + </folding>
  1064 + </state>
  1065 + </provider>
  1066 + </entry>
  1067 + <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
1024 <provider selected="true" editor-type-id="text-editor"> 1068 <provider selected="true" editor-type-id="text-editor">
1025 <state relative-caret-position="273"> 1069 <state relative-caret-position="273">
1026 - <caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" /> 1070 + <caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
1027 </state> 1071 </state>
1028 </provider> 1072 </provider>
1029 </entry> 1073 </entry>
@@ -110,7 +110,7 @@ class IndexController extends HomeBaseController @@ -110,7 +110,7 @@ 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' => '保存成功']);
@@ -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
@@ -19,7 +19,6 @@ class UserBaseController extends HomeBaseController @@ -19,7 +19,6 @@ class UserBaseController extends HomeBaseController
19 { 19 {
20 if(session('user.id')){ 20 if(session('user.id')){
21 $login_info = Db::name('user')->where(['id'=>session('user.id')])->find(); 21 $login_info = Db::name('user')->where(['id'=>session('user.id')])->find();
22 - var_dump($login_info);  
23 if(!$login_info){ 22 if(!$login_info){
24 session('user.id',null); 23 session('user.id',null);
25 24