外包项目 / 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 @@
<component name="ChangeListManager">
<list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/admin/controller/UserController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/admin/controller/UserController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" beforeDir="false" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -42,69 +42,50 @@
</provider>
</entry>
</file>
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
<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="273">
<caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
<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="-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 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="ListsController.php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/ListsController.php">
<file leaf-file-name="IndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2440">
<caret line="187" column="40" selection-start-line="187" selection-start-column="40" selection-end-line="187" selection-end-column="40" />
<state relative-caret-position="2520">
<caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
<folding>
<element signature="e#2713#3721#0#PHP" />
<element signature="e#5505#6819#0#PHP" />
<element signature="e#628#666#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<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="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="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="RegController [2].php" pinned="false" current-in-tab="false">
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
<file leaf-file-name="UserBaseController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.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 relative-caret-position="273">
<caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
</state>
</provider>
</entry>
</file>
<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">
<file leaf-file-name="confirm_order.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="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 relative-caret-position="357">
<caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
</state>
</provider>
</entry>
... ... @@ -167,13 +148,14 @@
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
<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" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php" />
</list>
</option>
</component>
... ... @@ -232,13 +214,13 @@
<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="portal" 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="portal" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -249,6 +231,36 @@
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="portal" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="themes" type="462c0819:PsiDirectoryNode" />
<item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
<item name="portal" type="462c0819:PsiDirectoryNode" />
<item name="index" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="dm161xcgit" type="b2602c69:ProjectViewProjectNode" />
<item name="dm161xcgit" type="462c0819:PsiDirectoryNode" />
<item name="simplewind" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -317,14 +329,7 @@
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="20814000" />
<workItem from="1535633001243" duration="9779000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1535458170068</updated>
<workItem from="1535633001243" duration="11133000" />
</task>
<task id="LOCAL-00002" summary="修复教练的时间段可以重复预约">
<created>1535458750848</created>
... ... @@ -655,11 +660,25 @@
<option name="project" value="LOCAL" />
<updated>1535640236039</updated>
</task>
<option name="localTasksCounter" value="49" />
<task id="LOCAL-00049" summary="登录处理">
<created>1535645567208</created>
<option name="number" value="00049" />
<option name="presentableId" value="LOCAL-00049" />
<option name="project" value="LOCAL" />
<updated>1535645567208</updated>
</task>
<task id="LOCAL-00050" summary="登录处理">
<created>1535646952275</created>
<option name="number" value="00050" />
<option name="presentableId" value="LOCAL-00050" />
<option name="project" value="LOCAL" />
<updated>1535646952275</updated>
</task>
<option name="localTasksCounter" value="51" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64231000" />
<option name="totallyTimeSpent" value="65585000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -686,6 +705,28 @@
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
</layout>
<layout-to-restore>
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info id="npm" order="2" side_tool="true" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14658849" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Database Changes" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Find" order="1" weight="0.32881355" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Terminal" order="9" />
<window_info anchor="bottom" id="Event Log" order="10" side_tool="true" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Version Control" order="11" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info id="Favorites" order="3" side_tool="true" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
<option name="version" value="1" />
... ... @@ -706,13 +747,6 @@
<option name="LAST_COMMIT_MESSAGE" value="登录处理" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/api/user/model/UserFavoriteModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1827">
<caret line="93" column="28" selection-start-line="93" selection-start-column="28" selection-end-line="93" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/user/route.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="105">
... ... @@ -924,13 +958,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.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>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/HomeBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
... ... @@ -948,13 +975,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.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>
</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" />
... ... @@ -967,20 +987,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="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">
... ... @@ -1006,10 +1012,24 @@
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/RegController [2].php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.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 relative-caret-position="273">
<caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$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://$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>
... ... @@ -1020,10 +1040,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
<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://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/confirm_order.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
<caret line="35" column="17" lean-forward="true" selection-start-line="35" selection-start-column="17" selection-end-line="35" selection-end-column="17" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/portal/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2520">
<caret line="128" column="5" lean-forward="true" selection-start-line="128" selection-start-column="5" selection-end-line="128" selection-end-column="5" />
<folding>
<element signature="e#628#666#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/UserBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="82" column="22" selection-start-line="82" selection-start-column="22" selection-end-line="82" selection-end-column="22" />
<caret line="21" column="12" selection-start-line="21" selection-start-column="12" selection-end-line="21" selection-end-column="12" />
</state>
</provider>
</entry>
... ...
... ... @@ -110,7 +110,7 @@ class IndexController extends HomeBaseController
->find();
if ($re) {
$dataup['id'] = $re['id'];
// session('user.id', $dataup['id']);
session('pay_uid', $dataup['id']);
$res = Db::name('user')->update($dataup);
if ($res) {
return json(['code' => '1', 'msg' => '保存成功']);
... ... @@ -129,7 +129,7 @@ class IndexController extends HomeBaseController
{
$gid = $req->param('gid');
$id = session('user.id');
$id = session('pay_uid');
$re = Db::name('user')->where(['id' => $id])->find();
$res = Db::name('goods')->where(['id' => $gid])->find();
... ...
... ... @@ -19,7 +19,6 @@ class UserBaseController extends HomeBaseController
{
if(session('user.id')){
$login_info = Db::name('user')->where(['id'=>session('user.id')])->find();
var_dump($login_info);
if(!$login_info){
session('user.id',null);
... ...