禁用

app/Http/Controllers/Web/Content/BuyhouseController.php

@@ -98,8 +98,8 @@ class BuyhouseController extends WebBaseController
             return response()->json(['status' => 0, 'msg' => '请先登录']);
         }
 
-        $data    = $request->only(['realname', 'card_t_cn', 'id_card']);
-        MemberInfo::where('uid',$user_id)->update($data);
+        $data = $request->only(['realname', 'card_t_cn', 'id_card']);
+        MemberInfo::where('uid', $user_id)->update($data);
 
         return response()->json(['status' => 1, 'msg' => '修改成功']);
     }
@@ -224,11 +224,15 @@ class BuyhouseController extends WebBaseController
             //审核状态
             if ($apply['is_draft'] == 2) {
                 if ($apply['rs_check_status'] != 2) {
-                    $check['status_text'] = '人社局' . $this->apply_status[$apply['rs_check_status']];
-                    $check['comment']     = $apply['rs_check_status'] == 1 ? '' : $apply['rs_check_comment'];
-                    $check['type']        = $this->check_type[$apply['rs_check_status']];
+                    if ($apply['type'] == 1) {
+                        $check['status_text'] = '人社局' . $this->apply_status[$apply['rs_check_status']];
+                    } else {
+                        $check['status_text'] = '集成电路' . $this->apply_status[$apply['rs_check_status']];
+                    }
+                    $check['comment'] = $apply['rs_check_status'] == 1 ? '' : $apply['rs_check_comment'];
+                    $check['type']    = $this->check_type[$apply['rs_check_status']];
                 } elseif ($apply['zj_check_status'] != 2) {
-                    $check['status_text'] = '住建局' . $this->apply_status[$apply['zj_check_status']];
+                    $check['status_text'] = '自然资源局' . $this->apply_status[$apply['zj_check_status']];
                     $check['comment']     = $apply['zj_check_status'] == 1 ? '' : $apply['zj_check_comment'];
                     $check['type']        = $this->check_type[$apply['zj_check_status']];
                 } else {
@@ -329,10 +333,10 @@ class BuyhouseController extends WebBaseController
             //草稿
             $formDisable = 'false';
         } else {
-            if ($time < $house['apply_time_end'] && $apply['status'] != 2) {
+            if ($time < strtotime($house['apply_time_end']) && $apply['status'] != 2) {
                 $formDisable = 'false';
             } else {
-                if ($time < $house['supply_time'] && ($apply['rs_check_status'] == 3 || $apply['zj_check_status'] == 3)) {
+                if ($time < strtotime($house['supply_time']) && ($apply['rs_check_status'] == 3 || $apply['zj_check_status'] == 3)) {
                     $formDisable = 'false';
                 }
             }