From 1e77d682d31776364ade32c1aa7733dc87831cc9 Mon Sep 17 00:00:00 2001
From: lccsw <805383944@qq.com>
Date: Fri, 19 Aug 2022 16:35:12 +0800
Subject: [PATCH] =?UTF-8?q?add-api-=C2=96delivery=5Fck=5Fimg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/receiver/orderv2/Orders.php |  2 +-
 admin/views/receiver/orderv2/get/ckinfo.php   | 21 +++++++++++++++++++
 admin/views/receiver/orderv2/get/paylog.php   | 15 +++++++++++--
 api/controllers/wxapp/licheb/Cusorderdata.php | 21 ++++++++++++++++---
 .../libraries/receiver/Order_datas_entity.php |  2 ++
 5 files changed, 55 insertions(+), 6 deletions(-)

diff --git a/admin/controllers/receiver/orderv2/Orders.php b/admin/controllers/receiver/orderv2/Orders.php
index 51aeb77c..f17f450c 100644
--- a/admin/controllers/receiver/orderv2/Orders.php
+++ b/admin/controllers/receiver/orderv2/Orders.php
@@ -238,7 +238,6 @@ class Orders extends HD_Controller
         //获取审核资料信息
         $img_data = $this->receiver_order_datas_model->get(['o_id'=>$row['id'],'status>='=>0]);
         $row['imgs_status'] = $this->order_datas_entity->data_ckinfo($img_data,$row['main_type']);
-
         //获取开票
         $bill_ck_img = json_decode($img_data['bill_ck_img'],true);
         if($bill_ck_img){
@@ -770,6 +769,7 @@ class Orders extends HD_Controller
                         'pay_time' => $item['pay_time'],
                         'company' => $company ? $company['short'] : '',
                         'opt_name' => $opt_name,
+                        'show_img' => 0,
                         'descrip' => $item['descrip'],
                         'img' => $item['img'] ? build_qiniu_image_url($item['img']) : '',
                     ];
diff --git a/admin/views/receiver/orderv2/get/ckinfo.php b/admin/views/receiver/orderv2/get/ckinfo.php
index fef6400c..66f53fb9 100644
--- a/admin/views/receiver/orderv2/get/ckinfo.php
+++ b/admin/views/receiver/orderv2/get/ckinfo.php
@@ -285,6 +285,27 @@
                 </ul>
             </div>
         </div>
+        <div class="">
+            <p class="am-text-default mb10 ml30 pt15 pb10">新车交付确认书:</p>
+            <ul class="photopic-list ml30 clearfix">
+                <?if($info['imgs_status']['delivery_ck_img']['imgs'][0]){?>
+                    <li style="position:relative;">
+                        <div style="position:absolute;top:5px;right:0;padding:0 8px 2px 8px;line-height:22px; background-color:rgba(0,0,0,.5);font-size:14px;color:#fff;" onclick="del_img('data','delivery_ck_img','')">x</div>
+                        <a target="_blank" class="pic" id="layer-photos-demo-321">
+                            <img src="<?=$info['imgs_status']['delivery_ck_img']['imgs'][0]?>" @click="show_carimg(321)"/>
+                        </a>
+                    </li>
+                <?}else{?>
+                    <li>
+                        <a href="javascript:void(0);" class="pic" data-file="1" data-type="jpg,png,gif,png,jpeg"
+                           data-uptype="qiniu" data-field="delivery_ck_img" data-mark="compalbum">
+                            <input type="hidden" class="delivery_ck_img" name="delivery_ck_img" data-type="1" value="" onchange="upImg('delivery_ck_img',this)">
+                            <img  src="/static/images/webuploader/add_img_pic.png" />
+                        </a>
+                    </li>
+                <?}?>
+            </ul>
+        </div>
     </div>
 </div>
 <script>
diff --git a/admin/views/receiver/orderv2/get/paylog.php b/admin/views/receiver/orderv2/get/paylog.php
index b00a33f4..7872314b 100644
--- a/admin/views/receiver/orderv2/get/paylog.php
+++ b/admin/views/receiver/orderv2/get/paylog.php
@@ -21,14 +21,22 @@
                 </tr>
             </thead> 
             <tbody>
-                <tr v-for="item in list">
+                <tr v-for="(item,index) in list">
                     <td>{{item.money}}</td>
                     <td>{{item.type_cn}}</td>
                     <td>{{item.company}}</td>
                     <td>{{item.opt_name}}</td>
                     <td>{{item.descrip}}</td>
                     <td>
-                        <a :href="item.img" target="_blank" v-if="item.img"><img :src="item.img" class="w100 layui-layer-phimg"></a>
+                        <template v-if="item.img">
+
+                            <template v-if="item.show_img==1">
+                                <a :href="item.img" target="_blank" v-if="item.img"><img :src="item.img" class="w100 layui-layer-phimg"></a>
+                            </template>
+                            <a v-else class="am-btn am-btn-primary am-btn-xs" @click="show_img(index)">
+                                查看
+                            </a>
+                        </template>
                     </td>
                     <td>{{item.pay_time}}</td>
                 </tr>
@@ -97,6 +105,9 @@
                     vm.page.page++;
                     vm.getData(vm.page.page);
                 },
+                show_img: function (index) {
+                    this.list[index]['show_img'] = true;
+                }
             }
         })
     })
diff --git a/api/controllers/wxapp/licheb/Cusorderdata.php b/api/controllers/wxapp/licheb/Cusorderdata.php
index 254772b3..e3c873ae 100644
--- a/api/controllers/wxapp/licheb/Cusorderdata.php
+++ b/api/controllers/wxapp/licheb/Cusorderdata.php
@@ -47,7 +47,7 @@ class Cusorderdata extends Wxapp{
                     'img' => build_qiniu_image_url($row_data['register_img'])
                 ];
             }
-            $bill_ck_img = $business_img = $insurance_img = [];
+            $delivery_ck_img = $bill_ck_img = $business_img = $insurance_img = [];
             $d_ins_info = json_decode($row_data['insurance_img'],true);
             if($d_ins_info){
                 $insurance_img = [
@@ -74,7 +74,13 @@ class Cusorderdata extends Wxapp{
                     $bill_ck_img[] = build_qiniu_image_url($item);
                 }
             }
-            $data['imgs'] = [
+            if($row_data['delivery_ck_img']){
+                $delivery_ck_img = [
+                    'value' => $row_data['delivery_ck_img'],
+                    'img' => build_qiniu_image_url($row_data['delivery_ck_img'])
+                ];
+            }
+            $imgs = [
                 'cardida' => [],
                 'cardidb' => [],
                 'business_licence' => [],
@@ -84,8 +90,12 @@ class Cusorderdata extends Wxapp{
                 'other_img' => [],
                 'insurance_img' => $insurance_img,
                 'business_img' => $business_img,
-                'bill_ck_img' => $bill_ck_img
+                'bill_ck_img' => $bill_ck_img,
             ];
+            if($row['s_id']==1 || $row['s_id']==33){ //（EX1 Pro和EX1需要上传交付确认书）
+                $imgs['delivery_ck_img'] = $delivery_ck_img;
+            }
+            $data['imgs'] = $imgs;
 
             if($row['main_type']){
                 if($row_data['business_licence']){
@@ -165,6 +175,7 @@ class Cusorderdata extends Wxapp{
         $other_imgs = $this->input_param('other_imgs');
         $insurance_img = $this->input_param('insurance_img');
         $business_img = $this->input_param('business_img');
+        $delivery_ck_img = $this->input_param('delivery_ck_img');
         $update = [];
         if($cardida){
             $full_cardida = build_qiniu_image_url($cardida);
@@ -236,6 +247,10 @@ class Cusorderdata extends Wxapp{
                 $key = 'register_img';
                 $img = $register_img;
             }
+            if($delivery_ck_img){
+                $key = 'delivery_ck_img';
+                $img = $delivery_ck_img;
+            }
             $key && $update[$key] = $img;
         }
         $res = $this->receiver_order_datas_model->update($update,['o_id'=>$id]);
diff --git a/common/libraries/receiver/Order_datas_entity.php b/common/libraries/receiver/Order_datas_entity.php
index ccf91cbe..fbcf5f3a 100644
--- a/common/libraries/receiver/Order_datas_entity.php
+++ b/common/libraries/receiver/Order_datas_entity.php
@@ -60,6 +60,7 @@ class Order_datas_entity{
                 'insurance_img' => ['text'=>'保单证','type'=>4,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],    //交强险图片
                 'business_img' => ['text'=>'保单证','type'=>4,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],    //商业险图片
                 'other_img' => ['text'=>'交车合照','type'=>5,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],  //交车合照
+                'delivery_ck_img' => ['text'=>'交车合照','type'=>6,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],  //交车确认图片
             ];
         }else{
             $result = [
@@ -70,6 +71,7 @@ class Order_datas_entity{
                 'insurance_img' => ['text'=>'交强险','type'=>4,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],    //交强险图片
                 'business_img' => ['text'=>'商业险','type'=>4,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],    //商业险图片
                 'other_img' => ['text'=>'交车合照','type'=>5,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],  //交车合照
+                'delivery_ck_img' => ['text'=>'交车合照','type'=>6,'up_status'=>0,'status'=>0,'status_cn'=>'未审核','imgs'=>[]],  //交车确认图片
             ];
         }
         $where = [