Merge branch 'master' of http://git2.haodian.cn/lcc/spacestation

api/controllers/wxapp/Wxapp.php

@@ -20,11 +20,11 @@ abstract class Wxapp extends HD_Controller
     protected $log_dir;//日志目录
     protected $session;//登录状态密钥
 
-    protected $login_white;//登录白名单每个ct单独管控
+    protected $login_white=[];//登录白名单每个ct单独管控
     protected $majia_white;//超级管理员披上马甲可操作权限
-    protected $check_status;//需校验用户正常请求列表，每个ct单独管控
-    protected $check_mobile;//需要校验手机号,每个ct单独管控
-    protected $check_headimg;//校验使用授权用户头像
+    protected $check_status = [];//需校验用户正常请求列表，每个ct单独管控
+    protected $check_mobile = [];//需要校验手机号,每个ct单独管控
+    protected $check_headimg = [];//校验使用授权用户头像
 
     protected $wx_config;//微信配置
     protected $cf_title;

api/controllers/wxapp/licheb/Cusorder.php

@@ -236,7 +236,11 @@ class Cusorder extends Wxapp
             if (!$data_row['car_img']) throw new Exception('行驶证未上传', ERR_PARAMS_ERROR);
             if (!$data_row['insurance_img']) throw new Exception('保单未上传', ERR_PARAMS_ERROR);
         }
-        $res = $this->orders_model->update(['status' => $status], ['id' => $id]);
+        $update = ['status' => $status];
+        if($status==3){
+            $update['over_time'] = date('Y-m-d H:i:s');
+        }
+        $res = $this->orders_model->update($update, ['id' => $id]);
         if ($res) {
             if($status == -1){
                 throw new Exception('操作成功', API_CODE_SUCCESS);