From 15562067aaf10bf2a68c1d31c3a670bff4515231 Mon Sep 17 00:00:00 2001
From: xxb <xuxianbin1990820@163.com>
Date: Fri, 3 Sep 2021 15:21:29 +0800
Subject: [PATCH] liche update for admin order modfy

---
 admin/controllers/receiver/Orders.php         |  3 +-
 admin/views/receiver/order/agent/lists.php    | 34 +++-----
 admin/views/receiver/order/bill/lists.php     | 34 +++-----
 admin/views/receiver/order/ckcar/lists.php    | 34 +++-----
 admin/views/receiver/order/delivery/lists.php | 34 +++-----
 admin/views/receiver/order/loan/lists.php     | 26 +++---
 admin/views/receiver/orders/get.php           | 82 ++++++++++---------
 7 files changed, 97 insertions(+), 150 deletions(-)

diff --git a/admin/controllers/receiver/Orders.php b/admin/controllers/receiver/Orders.php
index d310cf42..800164f3 100644
--- a/admin/controllers/receiver/Orders.php
+++ b/admin/controllers/receiver/Orders.php
@@ -36,7 +36,6 @@ class Orders extends HD_Controller{
         if(!$row){
             return $this->show_json(SYS_CODE_FAIL, '订单不存在!');
         }
-        $row['sid'] = '*********';
         $row['info_json'] = json_decode($row['info_json'],true);
         $row['status'] = intval($row['status']);
         $row['price'] = number_format($row['price'],2);
@@ -47,7 +46,7 @@ class Orders extends HD_Controller{
         $row['payway'] = intval($row['payway']);
         $row['item_id'] = intval($row['item_id']);
         $row['cardid'] = $row['info_json']['cardid'] ? $row['info_json']['cardid'] : $row['info_json']['c_cardid'];
-        $row['address'] = $row['info_json']['address'] ? $row['info_json']['address'] : '';
+        $row['address'] = $row['info_json']['c_address'] ? $row['info_json']['c_address'] : '';
         //获取车信息
         $brand = $this->auto_brand_model->get(['id'=>$row['brand_id']],'name');
         $serie = $this->auto_series_model->get(['id'=>$row['s_id']],'name');
diff --git a/admin/views/receiver/order/agent/lists.php b/admin/views/receiver/order/agent/lists.php
index 9167f6e2..08d16c2a 100644
--- a/admin/views/receiver/order/agent/lists.php
+++ b/admin/views/receiver/order/agent/lists.php
@@ -102,41 +102,29 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="5%"><span>客户姓名</span></th>
-                <th width="9%"><span>客户电话</span></th>
-                <th width="5%"><span>品牌</span></th>
-                <th width="5%"><span>车型</span></th>
-                <th width="5%"><span>车身颜色</span></th>
-                <th width="5%"><span>内饰颜色</span></th>
-                <th width="5%"><span>车辆平台价</span></th>
-                <th width="5%"><span>定金</span></th>
-                <th width="5%"><span>付款方式</span></th>
-                <th width="5%"><span>状态</span></th>
+                <th width="10%"><span>客户姓名</span></th>
+                <th width="10%"><span>客户电话</span></th>
+                <th width="25%"><span>车辆</span></th>
+                <th width="10%"><span>车辆平台价</span></th>
+                <th width="10%"><span>定金</span></th>
+                <th width="10%"><span>付款方式</span></th>
+                <th width="10%"><span>状态</span></th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
             <?php if ($lists) {
                 foreach ($lists as $v) { ?>
-                    <tr>
-                        <td colspan="10" align="left">
-                            订单号：<?=$v['sid']?>
-                        </td>
-                    </tr>
                     <tr>
                         <td><?= $v['name'] ?></td>
                         <td><?= $v['mobile'] ?></td>
-                        <td><?= $v['brand_name'].$v['series_name'] ?></td>
-                        <td><?= $v['v_name'] ?></td>
-                        <td><?= $v['cor_name'] ?></td>
-                        <td><?= $v['incor_name'] ?></td>
+                        <td><?= "{$v['brand_name']}-{$v['series_name']}-{$v['v_name']}-{$v['cor_name']}" ?></td>
                         <td><?= number_format($v['price'],2) ?></td>
                         <td><?= number_format($v['deposit'],2) ?></td>
                         <td><?= $v['payway']?'全款':'贷款' ?></td>
                         <td><?= $v['status_name'] ?></td>
-                    </tr>
-                    <tr>
-                        <td colspan="10" align="right">
-                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">查看详情</a>
+                        <td>
+                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">详情</a>
                         </td>
                     </tr>
                 <?php }
diff --git a/admin/views/receiver/order/bill/lists.php b/admin/views/receiver/order/bill/lists.php
index ac757200..75f1030f 100644
--- a/admin/views/receiver/order/bill/lists.php
+++ b/admin/views/receiver/order/bill/lists.php
@@ -102,41 +102,29 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="5%"><span>客户姓名</span></th>
-                <th width="9%"><span>客户电话</span></th>
-                <th width="5%"><span>品牌</span></th>
-                <th width="5%"><span>车型</span></th>
-                <th width="5%"><span>车身颜色</span></th>
-                <th width="5%"><span>内饰颜色</span></th>
-                <th width="5%"><span>车辆平台价</span></th>
-                <th width="5%"><span>定金</span></th>
-                <th width="5%"><span>付款方式</span></th>
-                <th width="5%"><span>状态</span></th>
+                <th width="10%"><span>客户姓名</span></th>
+                <th width="10%"><span>客户电话</span></th>
+                <th width="25%"><span>车辆</span></th>
+                <th width="10%"><span>车辆平台价</span></th>
+                <th width="10%"><span>定金</span></th>
+                <th width="10%"><span>付款方式</span></th>
+                <th width="10%"><span>状态</span></th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
             <?php if ($lists) {
                 foreach ($lists as $v) { ?>
-                    <tr>
-                        <td colspan="10" align="left">
-                            订单号：<?=$v['sid']?>
-                        </td>
-                    </tr>
                     <tr>
                         <td><?= $v['name'] ?></td>
                         <td><?= $v['mobile'] ?></td>
-                        <td><?= $v['brand_name'].$v['series_name'] ?></td>
-                        <td><?= $v['v_name'] ?></td>
-                        <td><?= $v['cor_name'] ?></td>
-                        <td><?= $v['incor_name'] ?></td>
+                        <td><?= "{$v['brand_name']}-{$v['series_name']}-{$v['v_name']}-{$v['cor_name']}" ?></td>
                         <td><?= number_format($v['price'],2) ?></td>
                         <td><?= number_format($v['deposit'],2) ?></td>
                         <td><?= $v['payway']?'全款':'贷款' ?></td>
                         <td><?= $v['status_name'] ?></td>
-                    </tr>
-                    <tr>
-                        <td colspan="10" align="right">
-                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">查看详情</a>
+                        <td>
+                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">详情</a>
                         </td>
                     </tr>
                 <?php }
diff --git a/admin/views/receiver/order/ckcar/lists.php b/admin/views/receiver/order/ckcar/lists.php
index 061504b6..17d6e506 100644
--- a/admin/views/receiver/order/ckcar/lists.php
+++ b/admin/views/receiver/order/ckcar/lists.php
@@ -102,41 +102,29 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="5%"><span>客户姓名</span></th>
-                <th width="9%"><span>客户电话</span></th>
-                <th width="5%"><span>品牌</span></th>
-                <th width="5%"><span>车型</span></th>
-                <th width="5%"><span>车身颜色</span></th>
-                <th width="5%"><span>内饰颜色</span></th>
-                <th width="5%"><span>车辆平台价</span></th>
-                <th width="5%"><span>定金</span></th>
-                <th width="5%"><span>付款方式</span></th>
-                <th width="5%"><span>状态</span></th>
+                <th width="10%"><span>客户姓名</span></th>
+                <th width="10%"><span>客户电话</span></th>
+                <th width="25%"><span>车辆</span></th>
+                <th width="10%"><span>车辆平台价</span></th>
+                <th width="10%"><span>定金</span></th>
+                <th width="10%"><span>付款方式</span></th>
+                <th width="10%"><span>状态</span></th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
             <?php if ($lists) {
                 foreach ($lists as $v) { ?>
-                    <tr>
-                        <td colspan="10" align="left">
-                            订单号：<?=$v['sid']?>
-                        </td>
-                    </tr>
                     <tr>
                         <td><?= $v['name'] ?></td>
                         <td><?= $v['mobile'] ?></td>
-                        <td><?= $v['brand_name'].$v['series_name'] ?></td>
-                        <td><?= $v['v_name'] ?></td>
-                        <td><?= $v['cor_name'] ?></td>
-                        <td><?= $v['incor_name'] ?></td>
+                        <td><?= "{$v['brand_name']}-{$v['series_name']}-{$v['v_name']}-{$v['cor_name']}" ?></td>
                         <td><?= number_format($v['price'],2) ?></td>
                         <td><?= number_format($v['deposit'],2) ?></td>
                         <td><?= $v['payway']?'全款':'贷款' ?></td>
                         <td><?= $v['status_name'] ?></td>
-                    </tr>
-                    <tr>
-                        <td colspan="10" align="right">
-                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">查看详情</a>
+                        <td>
+                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">详情</a>
                         </td>
                     </tr>
                 <?php }
diff --git a/admin/views/receiver/order/delivery/lists.php b/admin/views/receiver/order/delivery/lists.php
index d339563a..ae6be7d5 100644
--- a/admin/views/receiver/order/delivery/lists.php
+++ b/admin/views/receiver/order/delivery/lists.php
@@ -102,41 +102,29 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="5%"><span>客户姓名</span></th>
-                <th width="9%"><span>客户电话</span></th>
-                <th width="5%"><span>品牌</span></th>
-                <th width="5%"><span>车型</span></th>
-                <th width="5%"><span>车身颜色</span></th>
-                <th width="5%"><span>内饰颜色</span></th>
-                <th width="5%"><span>车辆平台价</span></th>
-                <th width="5%"><span>定金</span></th>
-                <th width="5%"><span>付款方式</span></th>
-                <th width="5%"><span>状态</span></th>
+                <th width="10%"><span>客户姓名</span></th>
+                <th width="10%"><span>客户电话</span></th>
+                <th width="25%"><span>车辆</span></th>
+                <th width="10%"><span>车辆平台价</span></th>
+                <th width="10%"><span>定金</span></th>
+                <th width="10%"><span>付款方式</span></th>
+                <th width="10%"><span>状态</span></th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
             <?php if ($lists) {
                 foreach ($lists as $v) { ?>
-                    <tr>
-                        <td colspan="10" align="left">
-                            订单号：<?=$v['sid']?>
-                        </td>
-                    </tr>
                     <tr>
                         <td><?= $v['name'] ?></td>
                         <td><?= $v['mobile'] ?></td>
-                        <td><?= $v['brand_name'].$v['series_name'] ?></td>
-                        <td><?= $v['v_name'] ?></td>
-                        <td><?= $v['cor_name'] ?></td>
-                        <td><?= $v['incor_name'] ?></td>
+                        <td><?= "{$v['brand_name']}-{$v['series_name']}-{$v['v_name']}-{$v['cor_name']}" ?></td>
                         <td><?= number_format($v['price'],2) ?></td>
                         <td><?= number_format($v['deposit'],2) ?></td>
                         <td><?= $v['payway']?'全款':'贷款' ?></td>
                         <td><?= $v['status_name'] ?></td>
-                    </tr>
-                    <tr>
-                        <td colspan="10" align="right">
-                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">查看详情</a>
+                        <td>
+                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">详情</a>
                         </td>
                     </tr>
                 <?php }
diff --git a/admin/views/receiver/order/loan/lists.php b/admin/views/receiver/order/loan/lists.php
index 74144765..860a940a 100644
--- a/admin/views/receiver/order/loan/lists.php
+++ b/admin/views/receiver/order/loan/lists.php
@@ -102,23 +102,19 @@
         <table class="am-table am-table-bordered">
             <thead>
             <tr>
-                <th width="5%"><span>客户姓名</span></th>
-                <th width="9%"><span>客户电话</span></th>
-                <th width="5%"><span>分期产品</span></th>
-                <th width="5%"><span>年限</span></th>
-                <th width="5%"><span>首付金额</span></th>
-                <th width="9%"><span>分期时间</span></th>
-                <th width="5%"><span>状态</span></th>
+                <th width="20%"><span>客户姓名</span></th>
+                <th width="10%"><span>客户电话</span></th>
+                <th width="15%"><span>分期产品</span></th>
+                <th width="10%"><span>年限</span></th>
+                <th width="10%"><span>首付金额</span></th>
+                <th width="10%"><span>分期时间</span></th>
+                <th width="10%"><span>状态</span></th>
+                <th width=""><span>操作</span></th>
             </tr>
             </thead>
             <tbody>
             <?php if ($lists) {
                 foreach ($lists as $v) { ?>
-                    <tr>
-                        <td colspan="7" align="left">
-                            订单号：<?=$v['sid']?>
-                        </td>
-                    </tr>
                     <tr>
                         <td><?= $v['name'] ?></td>
                         <td><?= $v['mobile'] ?></td>
@@ -127,10 +123,8 @@
                         <td><?= number_format($v['first_price'],2) ?></td>
                         <td><?= date('Y-m-d H:i:s',$v['c_time']) ?></td>
                         <td><?= $v['status_name'] ?></td>
-                    </tr>
-                    <tr>
-                        <td colspan="7" align="right">
-                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">查看详情</a>
+                        <td>
+                            <a href="javascript:;" data-open="/receiver/orders/get?id=<?=$v['o_id']?>" class="am-btn am-btn-primary am-btn-xs">详情</a>
                         </td>
                     </tr>
                 <?php }
diff --git a/admin/views/receiver/orders/get.php b/admin/views/receiver/orders/get.php
index f0ed022c..a891f9b2 100644
--- a/admin/views/receiver/orders/get.php
+++ b/admin/views/receiver/orders/get.php
@@ -1,5 +1,6 @@
 <div id="vue-edit" class="am-form am-form-horizontal" style="width: 98%;padding-top: 10px">
     <div class="am-u-lg-12">
+        <!-- 基本信息 -->
         <div class="am-panel am-panel-default">
             <div class="am-panel-hd">
                 <span style="font-size: 20px">基本信息</span>
@@ -8,47 +9,74 @@
             </div>
             <div class="am-panel-bd am-g" style="margin-top: 10px;margin-bottom: 10px;">
                 <div class="am-form-inline am-u-lg-12">
-                    <div class="am-form-group am-u-lg-4">
-                        <label class="am-para-label label-width"><span class="span-bold">订单编号：</span></label>
+                    <div class="am-form-group am-u-lg-3">
+                        <label class="am-para-label label-width"><span class="span-bold">订单号：</span></label>
                         <div class="am-para-input">
                             <label class="am-para-label align-l">{{info.sid}}</label>
                         </div>
                     </div>
-                    <div class="am-form-group am-u-lg-4">
+                    <div class="am-form-group am-u-lg-3">
                         <label class="am-para-label label-width"><span class="span-bold">订单创建时间：</span></label>
                         <div class="am-para-input">
                             <label class="am-para-label align-l">{{info.c_time}}</label>
                         </div>
                     </div>
-                    <div class="am-form-group am-u-lg-4">
-                        <label class="am-para-label label-width"><span class="span-bold">身份证号码：</span></label>
+                    <div class="am-form-group am-u-lg-3">
+                        <label class="am-para-label label-width"><span class="span-bold">合同状态：</span></label>
                         <div class="am-para-input">
-                            <label class="am-para-label align-l" v-if="info.cardid">{{info.cardid}}</label>
+                            <label class="am-para-label align-l">{{info.sign_status_name}}</label>
+                        </div>
+                    </div>
+                    <div class="am-form-group am-u-lg-3">
+                        <label class="am-para-label label-width"><span class="span-bold">渠道来源：</span></label>
+                        <div class="am-para-input">
+                            <label class="am-para-label align-l">{{info.cf_title}}</label>
                         </div>
                     </div>
                 </div>
+            </div>
+        </div>
+        <!-- 客户信息 -->
+        <div class="am-panel am-panel-default">
+            <div class="am-panel-hd">
+                <span style="font-size: 20px">客户信息</span>
+                <span style="float:right;margin-top:5px">
+                </span>
+            </div>
+            <div class="am-panel-bd am-g" style="margin-top: 10px;margin-bottom: 10px;">
                 <div class="am-form-inline am-u-lg-12">
-                    <div class="am-form-group am-u-lg-4">
+                    <div class="am-form-group am-u-lg-6">
                         <label class="am-para-label label-width"><span class="span-bold">客户姓名：</span></label>
                         <div class="am-para-input">
                             <label class="am-para-label align-l">{{info.name}}</label>
                         </div>
                     </div>
-                    <div class="am-form-group am-u-lg-4">
+                    <div class="am-form-group am-u-lg-6">
                         <label class="am-para-label label-width"><span class="span-bold">客户手机号：</span></label>
                         <div class="am-para-input">
                             <label class="am-para-label align-l">{{info.mobile}}</label>
                         </div>
                     </div>
-                    <div class="am-form-group am-u-lg-4">
+                </div>
+                <div class="am-form-inline am-u-lg-12">
+                    <div class="am-form-group am-u-lg-6">
+                        <label class="am-para-label label-width"><span class="span-bold">身份证号码：</span></label>
+                        <div class="am-para-input">
+                            <label class="am-para-label align-l" v-if="info.cardid">{{info.cardid}}</label>
+                        </div>
+                    </div>
+                    <div class="am-form-group am-u-lg-6">
+                        <label class="am-para-label label-width"><span class="span-bold">地址：</span></label>
+                        <div class="am-para-input">
+                            <label class="am-para-label align-l wp80">{{info.address}}</label>
+                        </div>
+                    </div>
+                </div>
+                <div class="am-form-inline am-u-lg-12">
+                    <div class="am-form-group am-u-lg-6">
                         <template v-if="info.bill && (info.bill.cardidA || info.bill.cardidB)">
                             <label class="am-para-label label-width"><span class="span-bold">身份证图片：</span></label>
                             <div class="am-para-input">
-                                <!--
-                                <a href="javascript:;" class="am-btn am-btn-default am-btn-sm" @click="show_carimg">
-                                    查看图片&nbsp;<i class="am-icon-search-plus"></i>
-                                </a>
-                                -->
                                 <div id="layer-photos-demo" class="layer-photos-demo">
                                     <img v-if="info.bill && info.bill.cardidA" :layer-src="info.bill.cardidA"
                                          :src="info.bill.cardidA" class="w100" alt="身份证正面" @click="show_carimg"
@@ -61,32 +89,6 @@
                         </template>
                     </div>
                 </div>
-                <div class="am-form-inline am-u-lg-12">
-                    <div class="am-form-group am-u-lg-4">
-                        <label class="am-para-label label-width"><span class="span-bold">合同状态：</span></label>
-                        <div class="am-para-input">
-                            <label class="am-para-label align-l">{{info.sign_status_name}}</label>
-                        </div>
-                    </div>
-                    <div class="am-form-group am-u-lg-4">
-                        <label class="am-para-label label-width"><span class="span-bold">渠道来源：</span></label>
-                        <div class="am-para-input">
-                            <label class="am-para-label align-l">{{info.cf_title}}</label>
-                        </div>
-                    </div>
-                    <div class="am-form-group am-u-lg-4 align-r">
-                        <a class='am-btn am-btn-primary am-btn-xs'>短信</a>
-                        <a class='am-btn am-btn-primary am-btn-xs'>拨打电话</a>
-                    </div>
-                </div>
-                <div class="am-form-inline am-u-lg-12">
-                    <div class="am-form-group am-u-lg-8">
-                        <label class="am-para-label label-width"><span class="span-bold">地址：</span></label>
-                        <div class="am-para-input">
-                            <label class="am-para-label align-l wp80">{{info.address}}</label>
-                        </div>
-                    </div>
-                </div>
             </div>
         </div>
         <!--订单明细-->