外包项目 / 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 @@
<component name="ChangeListManager">
<list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/admin/controller/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/UserController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -17,25 +17,18 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="YuyueController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/YuyueController.php">
<file leaf-file-name="SignatureHelper.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="660">
<caret line="162" column="47" lean-forward="true" selection-start-line="162" selection-start-column="47" selection-end-line="162" selection-end-column="47" />
<folding>
<element signature="e#636#668#0#PHP" expanded="true" />
<element signature="e#17688#17731#0#PHP" />
<element signature="e#17688#17779#0#PHP" />
</folding>
</state>
<state relative-caret-position="-99" />
</provider>
</entry>
</file>
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/index.php">
<file leaf-file-name="sendSms.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="12" column="21" selection-start-line="12" selection-start-column="21" selection-end-line="12" selection-end-column="21" />
<state relative-caret-position="1344">
<caret line="76" selection-start-line="76" selection-end-line="76" />
</state>
</provider>
</entry>
... ... @@ -43,63 +36,75 @@
<file leaf-file-name="BookingController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="194" column="41" lean-forward="true" selection-start-line="194" selection-start-column="27" selection-end-line="194" selection-end-column="41" />
<state relative-caret-position="534">
<caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
<caret line="13" selection-start-line="13" selection-end-line="13" selection-end-column="13" />
<state relative-caret-position="273">
<caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="CommentController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor" />
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-99">
<caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
<file leaf-file-name="ListsController.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="315">
<caret line="23" column="40" lean-forward="true" selection-start-line="23" selection-start-column="40" selection-end-line="23" selection-end-column="40" />
<state relative-caret-position="2440">
<caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" />
<folding>
<element signature="e#2713#3721#0#PHP" />
<element signature="e#5505#6819#0#PHP" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="helper.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/thinkphp/helper.php">
<file leaf-file-name="RegController.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="549">
<caret line="293" column="13" selection-start-line="293" selection-start-column="13" selection-end-line="293" selection-end-column="13" />
<state relative-caret-position="126">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="BaseController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
<provider selected="true" editor-type-id="text-editor" />
<file leaf-file-name="student.html" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468">
<caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<file leaf-file-name="RegController [2].php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468">
<caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
<state relative-caret-position="279">
<caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="HomeBaseController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
<file leaf-file-name="ProfileController [2].php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="37" lean-forward="true" selection-start-line="37" selection-end-line="37" />
<state relative-caret-position="567">
<caret line="214" column="50" lean-forward="true" selection-start-line="214" selection-start-column="50" selection-end-line="214" selection-end-column="50" />
</state>
</provider>
</entry>
... ... @@ -163,6 +168,12 @@
<option value="$PROJECT_DIR$/app/user/controller/YuyueController.php" />
<option value="$PROJECT_DIR$/public/index.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php" />
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
</list>
</option>
</component>
... ... @@ -215,6 +226,24 @@
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="app" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -244,7 +273,7 @@
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../lwyzdev" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../ThinkCMF" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="nodejs_package_manager_path" value="npm" />
... ... @@ -288,7 +317,7 @@
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="20814000" />
<workItem from="1535633001243" duration="5571000" />
<workItem from="1535633001243" duration="9779000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -612,11 +641,25 @@
<option name="project" value="LOCAL" />
<updated>1535638797137</updated>
</task>
<option name="localTasksCounter" value="47" />
<task id="LOCAL-00047" summary="登录处理">
<created>1535639135284</created>
<option name="number" value="00047" />
<option name="presentableId" value="LOCAL-00047" />
<option name="project" value="LOCAL" />
<updated>1535639135284</updated>
</task>
<task id="LOCAL-00048" summary="登录处理">
<created>1535640236039</created>
<option name="number" value="00048" />
<option name="presentableId" value="LOCAL-00048" />
<option name="project" value="LOCAL" />
<updated>1535640236039</updated>
</task>
<option name="localTasksCounter" value="49" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="60023000" />
<option name="totallyTimeSpent" value="64231000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -663,44 +706,6 @@
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/wxapp/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="18" selection-start-line="18" selection-end-line="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/wxapp/route.php" />
<entry file="file://$PROJECT_DIR$/api/config.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="448">
<caret line="262" column="28" selection-start-line="262" selection-start-column="28" selection-end-line="262" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/api/service/UserToken.php" />
<entry file="file://$USER_HOME$/Downloads/y0zdij/Zerg/application/route.php" />
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="20" column="24" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/controller/CommentsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="18" column="51" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/model/UserModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
<caret line="30" column="22" selection-start-line="30" selection-start-column="22" selection-end-line="30" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/model/UserFavoriteModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1827">
... ... @@ -897,13 +902,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
<caret line="194" column="41" lean-forward="true" selection-start-line="194" selection-start-column="27" selection-end-line="194" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/CommentController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -940,13 +938,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468">
<caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/BaseController.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -964,5 +955,77 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/SignatureHelper.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-99" />
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/sendSms.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1344">
<caret line="76" selection-start-line="76" selection-end-line="76" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/BookingController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="534">
<caret line="195" column="31" selection-start-line="195" selection-start-column="31" selection-end-line="195" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-99">
<caret line="49" column="11" lean-forward="true" selection-start-line="49" selection-start-column="11" selection-end-line="49" selection-end-column="80" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2440">
<caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" />
<folding>
<element signature="e#2713#3721#0#PHP" />
<element signature="e#5505#6819#0#PHP" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="15" column="19" selection-start-line="15" selection-start-column="19" selection-end-line="15" selection-end-column="19" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/student.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="468">
<caret line="51" lean-forward="true" selection-start-line="51" selection-end-line="51" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="279">
<caret line="573" column="12" lean-forward="true" selection-start-line="573" selection-start-column="12" selection-end-line="573" selection-end-column="12" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ProfileController [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="567">
<caret line="214" column="50" lean-forward="true" selection-start-line="214" selection-start-column="50" selection-end-line="214" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -80,6 +80,7 @@ class UserController extends AdminBaseController
{
/**查询条件**/
$where = ["user_type" => 2];
$where = ["student_type" => 1];
/**搜索条件**/
$user_nickname = $this->request->param('user_nickname');
$mobile = trim($this->request->param('mobile'));
... ...
... ... @@ -36,7 +36,7 @@
</li>
<li>
<b>年龄</b>
<i>{$data.birthday|birthday_name}</i>
<i>{$data.birthday}</i>
</li>
<li>
<b>身份证</b>
... ...