我的订单详情标题

xiaohu thinkpad
.idea/workspace.xml
app/user/controller/LoginController.php
--- a/.idea/workspace.xml
查看文件 @aee522f
+++ b/.idea/workspace.xml
查看文件 @aee522f
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="03b59864-5835-4588-bfae-54004809f199" name="Default" comment="">
-      <change beforePath="$PROJECT_DIR$/app/portal/controller/IndexController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/portal/controller/IndexController.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/user/controller/LoginController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/user/controller/LoginController.php" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -17,23 +17,6 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="hezuo_huigu.htm" pinned="false" current-in-tab="false">
-        <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_huigu.htm">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="7602">
-              <caret line="362" column="14" selection-start-line="362" selection-start-column="14" selection-end-line="373" selection-end-column="31" />
-              <folding>
-                <element signature="n#style#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#2;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#3;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#4;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#5;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-                <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#section#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
-              </folding>
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file leaf-file-name="hezuo_jiuda.htm" pinned="false" current-in-tab="false">
         <entry file="file://$USER_HOME$/Documents/NetSarang/Xftp/Temporary/Temporary/hezuo_jiuda.htm">
           <provider selected="true" editor-type-id="text-editor">
@@ -118,8 +101,17 @@
       <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="189">
-              <caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
+            <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>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pay_success.html" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="420">
+              <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
             </state>
           </provider>
         </entry>
@@ -294,6 +286,40 @@
               <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="public" type="462c0819:PsiDirectoryNode" />
+              <item name="themes" type="462c0819:PsiDirectoryNode" />
+              <item name="simpleboot3" type="462c0819:PsiDirectoryNode" />
+              <item name="user" 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="user" type="462c0819:PsiDirectoryNode" />
+              <item name="order" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
@@ -309,6 +335,9 @@
     <property name="nodejs_package_manager_path" value="npm" />
   </component>
   <component name="RecentsManager">
+    <key name="CopyFile.RECENT_KEYS">
+      <recent name="D:\www\dm161xcgit\public\themes\simpleboot3\portal\index" />
+    </key>
     <key name="MoveFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/api/wxapp" />
     </key>
@@ -344,7 +373,7 @@
       <workItem from="1535514127808" duration="727000" />
       <workItem from="1535532970259" duration="2527000" />
       <workItem from="1535546044129" duration="20814000" />
-      <workItem from="1535633001243" duration="972000" />
+      <workItem from="1535633001243" duration="1354000" />
     </task>
     <task id="LOCAL-00001" summary="修复预约后不能再预约的问题">
       <created>1535458170068</created>
@@ -542,11 +571,25 @@
       <option name="project" value="LOCAL" />
       <updated>1535633219778</updated>
     </task>
-    <option name="localTasksCounter" value="29" />
+    <task id="LOCAL-00029" summary="我的订单详情标题">
+      <created>1535633983516</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1535633983516</updated>
+    </task>
+    <task id="LOCAL-00030" summary="我的订单详情标题">
+      <created>1535634119952</created>
+      <option name="number" value="00030" />
+      <option name="presentableId" value="LOCAL-00030" />
+      <option name="project" value="LOCAL" />
+      <updated>1535634119952</updated>
+    </task>
+    <option name="localTasksCounter" value="31" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55424000" />
+    <option name="totallyTimeSpent" value="55806000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
@@ -592,13 +635,6 @@
     <option name="LAST_COMMIT_MESSAGE" value="我的订单详情标题" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/api/home/route.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="76">
-          <caret line="4" column="18" selection-start-line="4" selection-start-column="17" selection-end-line="4" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/api/route.php">
       <provider selected="true" editor-type-id="text-editor" />
     </entry>
@@ -872,10 +908,17 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/public/themes/simpleboot3/portal/index/pay_success.html">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="420">
+          <caret line="20" column="34" lean-forward="true" selection-start-line="20" selection-start-column="34" selection-end-line="20" selection-end-column="34" />
+        </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="189">
-          <caret line="32" column="17" lean-forward="true" selection-start-line="32" selection-start-column="17" selection-end-line="32" selection-end-column="17" />
+        <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>
       </provider>
     </entry>
--- a/app/user/controller/LoginController.php
查看文件 @aee522f
+++ b/app/user/controller/LoginController.php
查看文件 @aee522f
@@ -82,6 +82,13 @@ class LoginController extends HomeBaseController
             $res = Db::name('user')->where(['mobile'=>$mobile])->find();
             if($res){
+
+                if ($res['user_type'] == '2' and $res['student_type'] != '1'){
+                    return json(['code'=>'0','msg'=>'抱歉，此用户没有权限登录']);
+                    //用户被拉黑
+                }elseif($res['user_status'] != '1'){
+                    return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);
+                }
                 //后台添加用户，微信登陆后合并数据
                 if($res['add_type'] == '2'){
                     $op_tel_info = Db::name('user')->where(['openid'=>session('openid'),'mobile'=>$mobile])->find();
@@ -97,11 +104,6 @@ class LoginController extends HomeBaseController
                         }
                     }
                 //学员成功支付后才可以登陆
-                }elseif ($res['user_type'] == '2' and $res['student_type'] == '2'){
-                    return json(['code'=>'0','msg'=>'抱歉，此用户没有权限登录']);
-                //用户被拉黑
-                }elseif($res['user_status'] != '1'){
-                    return json(['code'=>'0','msg'=>'抱歉，用户禁止登陆']);
                 }
                 session('user.id',$res['id']);
                 return json(['code'=>'1','msg'=>'登陆成功']);