外包项目 / signUpForCar · 提交

转到一个项目

作者 xiaohu thinkpad
提交 edaa0a1ca806817d10493c64bb68e32f8cd9035d 1 个父辈 58caf1db

我的订单详情标题

内嵌 并排对比
正在显示 2 个修改的文件 包含 32 行增加 和 16 行删除
... ... @@ -66,7 +66,7 @@
<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="20" selection-start-line="194" selection-start-column="20" selection-end-line="194" selection-end-column="20" />
<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>
... ... @@ -101,8 +101,8 @@
<file leaf-file-name="LoginController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/user/controller/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="85" column="75" selection-start-line="85" selection-start-column="75" selection-end-line="85" selection-end-column="75" />
<state relative-caret-position="336">
<caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
</state>
</provider>
</entry>
... ... @@ -169,9 +169,9 @@
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm" />
<option value="$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/user/order/order_details_1.html" />
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html" />
<option value="$PROJECT_DIR$/app/portal/controller/IndexController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/BookingController.php" />
<option value="$PROJECT_DIR$/app/user/controller/LoginController.php" />
</list>
</option>
... ... @@ -373,7 +373,7 @@
<workItem from="1535514127808" duration="727000" />
<workItem from="1535532970259" duration="2527000" />
<workItem from="1535546044129" duration="20814000" />
<workItem from="1535633001243" duration="1354000" />
<workItem from="1535633001243" duration="1606000" />
</task>
<task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
<created>1535458170068</created>
... ... @@ -585,11 +585,25 @@
<option name="project" value="LOCAL" />
<updated>1535634119952</updated>
</task>
<option name="localTasksCounter" value="31" />
<task id="LOCAL-00031" summary="我的订单详情标题">
<created>1535634366456</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1535634366456</updated>
</task>
<task id="LOCAL-00032" summary="我的订单详情标题">
<created>1535634457149</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1535634457149</updated>
</task>
<option name="localTasksCounter" value="33" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="55806000" />
<option name="totallyTimeSpent" value="56058000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -887,13 +901,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="20" selection-start-line="194" selection-start-column="20" selection-end-line="194" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/booking/listing.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="420">
... ... @@ -915,10 +922,17 @@
</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/LoginController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="231">
<caret line="85" column="75" selection-start-line="85" selection-start-column="75" selection-end-line="85" selection-end-column="75" />
<state relative-caret-position="336">
<caret line="90" column="49" selection-start-line="90" selection-start-column="49" selection-end-line="90" selection-end-column="49" />
</state>
</provider>
</entry>
... ...
... ... @@ -88,6 +88,8 @@ class LoginController extends HomeBaseController
//用户被拉黑
}elseif($res['user_status'] != '1'){
return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);
}elseif($res['delete_time'] != '0'){
return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);
}
//后台添加用户，微信登陆后合并数据
if($res['add_type'] == '2'){
... ...