From c127a28b3304ca19be80daf54cc1e5da6568edd1 Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Tue, 2 Nov 2021 11:09:07 +0800
Subject: [PATCH] edit-admin-edit_order

---
 admin/controllers/receiver/Orders.php         | 12 ++----------
 admin/views/receiver/orders/agentinfo.php     |  2 +-
 api/controllers/wxapp/licheb/Customerlogs.php |  2 +-
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index d0f69c5f..79886867 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -403,14 +403,6 @@ class Orders extends HD_Controller
         }
         $update = [];
         if ($file) { //上传按揭通知函
-            if($params['type']){
-                $loan_time = $params['loan_time'];
-                if (!$loan_time) {
-                    return $this->show_json(SYS_CODE_FAIL, '请选择放款时间!');
-                }
-                $update['loan_time'] = date('Y-m-d H:i:s', strtotime($loan_time));
-                $update['status'] = 3;
-            }
             $path = FCPATH . 'temp/';
             if (!file_exists($path)) {
                 $oldumask = umask(0);
@@ -479,7 +471,7 @@ class Orders extends HD_Controller
                 ];
                 $ckcar && $replace['id'] = $ckcar['id'];
                 $this->order_ckcars_model->replace($replace);
-            } elseif ($params['status'] == 3 || ($file && $params['type'])) { //设置完成按揭
+            } elseif ($params['status'] == 3) { //设置完成按揭
                 $order_row = $this->orders_model->get(['id' => $row['o_id']], 'status');
                 if ($order_row['status'] == 4) { //完成代办
                     $this->orders_model->update(['status' => 5], ['id' => $oid]);
@@ -665,7 +657,7 @@ class Orders extends HD_Controller
         if (!$row) {
             return $this->show_json(SYS_CODE_FAIL, '参数错误!');
         }
-        if ($row['status'] != 4) {
+        if ($row['status'] >= 4) {
             return $this->show_json(SYS_CODE_FAIL, '修改失败,该订单不处于代办阶段');
         }
         $this->order_agents_model->update(['status' => 1], ['o_id' => $oid]);
diff --git a/admin/views/receiver/orders/agentinfo.php b/admin/views/receiver/orders/agentinfo.php
index 249b864b..98168204 100644
--- a/admin/views/receiver/orders/agentinfo.php
+++ b/admin/views/receiver/orders/agentinfo.php
@@ -159,7 +159,7 @@
                     <a href='javascript:;' class='am-btn am-btn-primary am-btn-xs' @click="save_agent">
                         保存
                     </a>
-                    <a class='am-btn am-btn-primary am-btn-xs ml10' v-if="info.status==4" data-ajax="post"
+                    <a class='am-btn am-btn-primary am-btn-xs ml10' v-if="info.agent && !info.agent.status" data-ajax="post"
                        data-action="/receiver/orders/edit_agentfh" :data-params-oid="info.id">
                         完成代办
                     </a>
diff --git a/api/controllers/wxapp/licheb/Customerlogs.php b/api/controllers/wxapp/licheb/Customerlogs.php
index 185d5884..65b1569b 100644
--- a/api/controllers/wxapp/licheb/Customerlogs.php
+++ b/api/controllers/wxapp/licheb/Customerlogs.php
@@ -100,7 +100,7 @@ class Customerlogs extends Wxapp{
 
     protected function post(){
         $id = $this->input_param('cus_id');
-        $log = $this->input_param('content');
+        $log = trim($this->input_param('content'));
         $img_arr = $this->input_param('imgs');
         if(!$log && !$img_arr){
             throw new Exception('参数错误', ERR_PARAMS_ERROR);