From e7dc2cd65162720076e1a0092407dbfd966ac1e7 Mon Sep 17 00:00:00 2001
From: lccsw <1127794702@qq.com>
Date: Fri, 17 Dec 2021 15:58:28 +0800
Subject: [PATCH] edit-admin-order_agent_list

---
 admin/libraries/OrdersList.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/admin/libraries/OrdersList.php b/admin/libraries/OrdersList.php
index 95101038..379bacd9 100644
--- a/admin/libraries/OrdersList.php
+++ b/admin/libraries/OrdersList.php
@@ -1209,9 +1209,9 @@ class OrdersList
         $count = $this->ci->order_agents_model->count_order($where, $t2);
         $lists = [];
         if ($count) {
-            $fileds = "$t1.o_id,$t1.status,$t1.c_time,";
+            $fileds = "$t1.o_id,$t1.status,$t1.u_time,$t1.c_time,$t1.jsondata,$t1.ins_img,$t1.car_img,";
             $fileds .= "$t2.rid,$t2.sid,$t2.name,$t2.mobile,$t2.brand_id,$t2.biz_id,$t2.s_id,$t2.v_id,$t2.cor_id,$t2.incor_id,$t2.price,$t2.deposit,$t2.payway,$t2.c_time,$t2.bill_time";
-            $rows = $this->ci->order_agents_model->select_order($where, "$t2.c_time desc", $page, $size, $fileds);
+            $rows = $this->ci->order_agents_model->select_order($where, "$t1.u_time desc", $page, $size, $fileds);
             //客户来源
             $str_rids = implode(',', array_unique(array_column($rows, 'rid')));
             !$str_rids && $str_rids = 0;
@@ -1256,13 +1256,19 @@ class OrdersList
                 $fields['deposit'] = number_format($val['deposit'], 2);
                 $fields['payway_name'] = $this->paywayAry[$val['payway']];
                 $fields['incor_name'] = isset($attr[$val['incor_id']]) ? $attr[$val['incor_id']][0]['title'] : '';
-                $fields['status_name'] = $status_arr[$val['status']];
+                $complete = "";
+                $jsondata = json_decode($val['jsondata'],true);
+                if($val['ins_img'] && $val['car_img'] && isset($jsondata['register_img']) && $jsondata['register_img']){
+                    $complete = "(已完成)";
+                }
+                $fields['status_name'] = $status_arr[$val['status']].$complete;
                 $fields['biz_name'] = $bizs[$val['biz_id']];
                 $fields['cf_title'] = $customers[$val['rid']][0]['cf_title'];
                 $cf_name = '';
                 $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'] && $cf_name = $cfroms[$customers[$val['rid']][0]['cf_id']][0]['title'].'(线上)<br>';
                 $customers[$val['rid']][0]['cf_clues'] && $cf_name .= $customers[$val['rid']][0]['cf_clues'].'(线下)';
                 $fields['cf_name'] = $cf_name;
+                $fields['u_time'] = date('Y-m-d H:i',strtotime($val['u_time']));
                 $lists[] = $fields;
             }
         }
@@ -1501,6 +1507,7 @@ class OrdersList
                 'payway_name' => ['title' => '付款方式', 'width' => '8%'],
                 'cf_title' => ['title' => '来源类型', 'width' => '9%'], 'cf_name' => ['title' => '来源','width' => '10%'],
                 'status_name' => ['title' => '状态', 'width' => '9%']];
+            $status_pid==4 && $fields2['u_time'] = ['title'=>'更新时间','width'=>'9%'];
             $fields = array_merge($fields1, $fields2);
         } else {
             $fields2 = ['car_name' => ['title' => '车辆', 'width' => '27%'],