外包项目 / signUpForCar · 提交

转到一个项目

作者 654550265
提交 ecd5a5019cbe86ad97ca89469026fe4aee836509 2 个父辈 d9f8fdbb 6b1cb902

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 164 行增加 和 100 行删除
@@ -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$/simplewind/cmf/controller/UserBaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" afterDir="false" /> 6 + <change beforePath="$PROJECT_DIR$/app/admin/controller/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/UserController.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,25 +17,18 @@ @@ -17,25 +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="false">  
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="660">  
24 - <caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />  
25 - <folding>  
26 - <element signature="e#636#668#0#PHP" expanded="true" />  
27 - <element signature="e#17688#17731#0#PHP" />  
28 - <element signature="e#17688#17779#0#PHP" />  
29 - </folding>  
30 - </state> 23 + <state relative-caret-position="-99" />
31 </provider> 24 </provider>
32 </entry> 25 </entry>
33 </file> 26 </file>
34 - <file leaf-file-name="index.php" pinned="false" current-in-tab="false">  
35 - <entry file="file://$PROJECT_DIR$/public/index.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">
36 <provider selected="true" editor-type-id="text-editor"> 29 <provider selected="true" editor-type-id="text-editor">
37 - <state relative-caret-position="126">  
38 - <caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" /> 30 + <state relative-caret-position="1344">
  31 + <caret line="76" selection-start-line="76" selection-end-line="76" />
39 </state> 32 </state>
40 </provider> 33 </provider>
41 </entry> 34 </entry>
@@ -43,63 +36,75 @@ @@ -43,63 +36,75 @@
43 <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">
44 <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php"> 37 <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
45 <provider selected="true" editor-type-id="text-editor"> 38 <provider selected="true" editor-type-id="text-editor">
46 - <state relative-caret-position="510">  
47 - <caret line="194" column="41" lean-forward="true" selection-start-line="194" selection-start-column="27" selection-end-line="194" selection-end-column="41" /> 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" />
48 </state> 41 </state>
49 </provider> 42 </provider>
50 </entry> 43 </entry>
51 </file> 44 </file>
52 - <file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">  
53 - <entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php"> 45 + <file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
  46 + <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
54 <provider selected="true" editor-type-id="text-editor"> 47 <provider selected="true" editor-type-id="text-editor">
55 - <state relative-caret-position="105">  
56 - <caret line="13" selection-start-line="13" selection-end-line="13" selection-end-column="13" /> 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" />
57 </state> 50 </state>
58 </provider> 51 </provider>
59 </entry> 52 </entry>
60 </file> 53 </file>
61 - <file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">  
62 - <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">  
63 - <provider selected="true" editor-type-id="text-editor" /> 54 + <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
  55 + <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
  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" />
  59 + </state>
  60 + </provider>
64 </entry> 61 </entry>
65 </file> 62 </file>
66 - <file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">  
67 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php"> 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">
68 <provider selected="true" editor-type-id="text-editor"> 65 <provider selected="true" editor-type-id="text-editor">
69 - <state relative-caret-position="315">  
70 - <caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" /> 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" />
  68 + <folding>
  69 + <element signature="e#2713#3721#0#PHP" />
  70 + <element signature="e#5505#6819#0#PHP" />
  71 + </folding>
71 </state> 72 </state>
72 </provider> 73 </provider>
73 </entry> 74 </entry>
74 </file> 75 </file>
75 - <file leaf-file-name="helper.php" pinned="false" current-in-tab="false">  
76 - <entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php"> 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">
77 <provider selected="true" editor-type-id="text-editor"> 78 <provider selected="true" editor-type-id="text-editor">
78 - <state relative-caret-position="549">  
79 - <caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" /> 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" />
80 </state> 81 </state>
81 </provider> 82 </provider>
82 </entry> 83 </entry>
83 </file> 84 </file>
84 - <file leaf-file-name="BaseController.php" pinned="false" current-in-tab="false">  
85 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">  
86 - <provider selected="true" editor-type-id="text-editor" /> 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>
87 </entry> 92 </entry>
88 </file> 93 </file>
89 - <file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">  
90 - <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php"> 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">
91 <provider selected="true" editor-type-id="text-editor"> 96 <provider selected="true" editor-type-id="text-editor">
92 - <state relative-caret-position="468">  
93 - <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" /> 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" />
94 </state> 99 </state>
95 </provider> 100 </provider>
96 </entry> 101 </entry>
97 </file> 102 </file>
98 - <file leaf-file-name="HomeBaseController.php" pinned="false" current-in-tab="false">  
99 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php"> 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">
100 <provider selected="true" editor-type-id="text-editor"> 105 <provider selected="true" editor-type-id="text-editor">
101 - <state relative-caret-position="420">  
102 - <caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" /> 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" />
103 </state> 108 </state>
104 </provider> 109 </provider>
105 </entry> 110 </entry>
@@ -163,6 +168,12 @@ @@ -163,6 +168,12 @@
163 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" /> 168 <option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
164 <option value="$PROJECT_DIR$/public/index.php" /> 169 <option value="$PROJECT_DIR$/public/index.php" />
165 <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" /> 170 <option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
  171 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" />
  172 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
  173 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php" />
  174 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html" />
  175 + <option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
  176 + <option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
166 </list> 177 </list>
167 </option> 178 </option>
168 </component> 179 </component>
@@ -215,6 +226,24 @@ @@ -215,6 +226,24 @@
215 <path> 226 <path>
216 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" /> 227 <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
217 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" /> 228 <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  229 + <item name="app" type="462c0819:PsiDirectoryNode" />
  230 + </path>
  231 + <path>
  232 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  233 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  234 + <item name="app" type="462c0819:PsiDirectoryNode" />
  235 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  236 + </path>
  237 + <path>
  238 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  239 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
  240 + <item name="app" type="462c0819:PsiDirectoryNode" />
  241 + <item name="admin" type="462c0819:PsiDirectoryNode" />
  242 + <item name="controller" type="462c0819:PsiDirectoryNode" />
  243 + </path>
  244 + <path>
  245 + <item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
  246 + <item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
218 <item name="public" type="462c0819:PsiDirectoryNode" /> 247 <item name="public" type="462c0819:PsiDirectoryNode" />
219 </path> 248 </path>
220 <path> 249 <path>
@@ -244,7 +273,7 @@ @@ -244,7 +273,7 @@
244 </component> 273 </component>
245 <component name="PropertiesComponent"> 274 <component name="PropertiesComponent">
246 <property name="WebServerToolWindowFactoryState" value="false" /> 275 <property name="WebServerToolWindowFactoryState" value="false" />
247 - <property name="last_opened_file_path" value="$PROJECT_DIR$/../lwyzdev" /> 276 + <property name="last_opened_file_path" value="$PROJECT_DIR$/../ThinkCMF" />
248 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" /> 277 <property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
249 <property name="nodejs_npm_path_reset_for_default_project" value="true" /> 278 <property name="nodejs_npm_path_reset_for_default_project" value="true" />
250 <property name="nodejs_package_manager_path" value="npm" /> 279 <property name="nodejs_package_manager_path" value="npm" />
@@ -288,7 +317,7 @@ @@ -288,7 +317,7 @@
288 <workItem from="1535514127808" duration="727000" /> 317 <workItem from="1535514127808" duration="727000" />
289 <workItem from="1535532970259" duration="2527000" /> 318 <workItem from="1535532970259" duration="2527000" />
290 <workItem from="1535546044129" duration="20814000" /> 319 <workItem from="1535546044129" duration="20814000" />
291 - <workItem from="1535633001243" duration="5571000" /> 320 + <workItem from="1535633001243" duration="9779000" />
292 </task> 321 </task>
293 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题"> 322 <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
294 <created>1535458170068</created> 323 <created>1535458170068</created>
@@ -612,11 +641,25 @@ @@ -612,11 +641,25 @@
612 <option name="project" value="LOCAL" /> 641 <option name="project" value="LOCAL" />
613 <updated>1535638797137</updated> 642 <updated>1535638797137</updated>
614 </task> 643 </task>
615 - <option name="localTasksCounter" value="47" /> 644 + <task id="LOCAL-00047" summary="登录处理">
  645 + <created>1535639135284</created>
  646 + <option name="number" value="00047" />
  647 + <option name="presentableId" value="LOCAL-00047" />
  648 + <option name="project" value="LOCAL" />
  649 + <updated>1535639135284</updated>
  650 + </task>
  651 + <task id="LOCAL-00048" summary="登录处理">
  652 + <created>1535640236039</created>
  653 + <option name="number" value="00048" />
  654 + <option name="presentableId" value="LOCAL-00048" />
  655 + <option name="project" value="LOCAL" />
  656 + <updated>1535640236039</updated>
  657 + </task>
  658 + <option name="localTasksCounter" value="49" />
616 <servers /> 659 <servers />
617 </component> 660 </component>
618 <component name="TimeTrackingManager"> 661 <component name="TimeTrackingManager">
619 - <option name="totallyTimeSpent" value="60023000" /> 662 + <option name="totallyTimeSpent" value="64231000" />
620 </component> 663 </component>
621 <component name="ToolWindowManager"> 664 <component name="ToolWindowManager">
622 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" /> 665 <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -663,44 +706,6 @@ @@ -663,44 +706,6 @@
663 <option name="LAST_COMMIT_MESSAGE" value="登录处理" /> 706 <option name="LAST_COMMIT_MESSAGE" value="登录处理" />
664 </component> 707 </component>
665 <component name="editorHistoryManager"> 708 <component name="editorHistoryManager">
666 - <entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php">  
667 - <provider selected="true" editor-type-id="text-editor">  
668 - <state relative-caret-position="228">  
669 - <caret line="18" selection-start-line="18" selection-end-line="18" />  
670 - </state>  
671 - </provider>  
672 - </entry>  
673 - <entry file="file://$PROJECT_DIR$/api/wxapp/route.php" />  
674 - <entry file="file://$PROJECT_DIR$/api/config.php">  
675 - <provider selected="true" editor-type-id="text-editor">  
676 - <state relative-caret-position="448">  
677 - <caret line="262" column="28" selection-start-line="262" selection-start-column="28" selection-end-line="262" selection-end-column="28" />  
678 - </state>  
679 - </provider>  
680 - </entry>  
681 - <entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/service/UserToken.php" />  
682 - <entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/route.php" />  
683 - <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">  
684 - <provider selected="true" editor-type-id="text-editor">  
685 - <state relative-caret-position="126">  
686 - <caret line="20" column="24" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="24" />  
687 - </state>  
688 - </provider>  
689 - </entry>  
690 - <entry file="file://$PROJECT_DIR$/api/user/controller/CommentsController.php">  
691 - <provider selected="true" editor-type-id="text-editor">  
692 - <state relative-caret-position="126">  
693 - <caret line="18" column="51" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="51" />  
694 - </state>  
695 - </provider>  
696 - </entry>  
697 - <entry file="file://$PROJECT_DIR$/api/user/model/UserModel.php">  
698 - <provider selected="true" editor-type-id="text-editor">  
699 - <state relative-caret-position="420">  
700 - <caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />  
701 - </state>  
702 - </provider>  
703 - </entry>  
704 <entry file="file://$PROJECT_DIR$/api/user/model/UserFavoriteModel.php"> 709 <entry file="file://$PROJECT_DIR$/api/user/model/UserFavoriteModel.php">
705 <provider selected="true" editor-type-id="text-editor"> 710 <provider selected="true" editor-type-id="text-editor">
706 <state relative-caret-position="1827"> 711 <state relative-caret-position="1827">
@@ -897,13 +902,6 @@ @@ -897,13 +902,6 @@
897 </state> 902 </state>
898 </provider> 903 </provider>
899 </entry> 904 </entry>
900 - <entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">  
901 - <provider selected="true" editor-type-id="text-editor">  
902 - <state relative-caret-position="510">  
903 - <caret line="194" column="41" lean-forward="true" selection-start-line="194" selection-start-column="27" selection-end-line="194" selection-end-column="41" />  
904 - </state>  
905 - </provider>  
906 - </entry>  
907 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php"> 905 <entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
908 <provider selected="true" editor-type-id="text-editor" /> 906 <provider selected="true" editor-type-id="text-editor" />
909 </entry> 907 </entry>
@@ -940,13 +938,6 @@ @@ -940,13 +938,6 @@
940 </state> 938 </state>
941 </provider> 939 </provider>
942 </entry> 940 </entry>
943 - <entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">  
944 - <provider selected="true" editor-type-id="text-editor">  
945 - <state relative-caret-position="468">  
946 - <caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />  
947 - </state>  
948 - </provider>  
949 - </entry>  
950 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php"> 941 <entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
951 <provider selected="true" editor-type-id="text-editor" /> 942 <provider selected="true" editor-type-id="text-editor" />
952 </entry> 943 </entry>
@@ -964,5 +955,77 @@ @@ -964,5 +955,77 @@
964 </state> 955 </state>
965 </provider> 956 </provider>
966 </entry> 957 </entry>
  958 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
  959 + <provider selected="true" editor-type-id="text-editor">
  960 + <state relative-caret-position="-99" />
  961 + </provider>
  962 + </entry>
  963 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
  964 + <provider selected="true" editor-type-id="text-editor">
  965 + <state relative-caret-position="1344">
  966 + <caret line="76" selection-start-line="76" selection-end-line="76" />
  967 + </state>
  968 + </provider>
  969 + </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">
  985 + <provider selected="true" editor-type-id="text-editor">
  986 + <state relative-caret-position="2440">
  987 + <caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" />
  988 + <folding>
  989 + <element signature="e#2713#3721#0#PHP" />
  990 + <element signature="e#5505#6819#0#PHP" />
  991 + </folding>
  992 + </state>
  993 + </provider>
  994 + </entry>
  995 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php">
  996 + <provider selected="true" editor-type-id="text-editor">
  997 + <state relative-caret-position="126">
  998 + <caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
  999 + </state>
  1000 + </provider>
  1001 + </entry>
  1002 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
  1003 + <provider selected="true" editor-type-id="text-editor">
  1004 + <state relative-caret-position="468">
  1005 + <caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
  1006 + </state>
  1007 + </provider>
  1008 + </entry>
  1009 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
  1010 + <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" />
  1013 + </state>
  1014 + </provider>
  1015 + </entry>
  1016 + <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [2].php">
  1017 + <provider selected="true" editor-type-id="text-editor">
  1018 + <state relative-caret-position="567">
  1019 + <caret line="214" column="50" lean-forward="true" selection-start-line="214" selection-start-column="50" selection-end-line="214" selection-end-column="50" />
  1020 + </state>
  1021 + </provider>
  1022 + </entry>
  1023 + <entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
  1024 + <provider selected="true" editor-type-id="text-editor">
  1025 + <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" />
  1027 + </state>
  1028 + </provider>
  1029 + </entry>
967 </component> 1030 </component>
968 </project> 1031 </project>
@@ -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'));
@@ -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>