From 180861136f8c4074ba4ab521ff37a443589d856b Mon Sep 17 00:00:00 2001
From: xxb <xuxianbin1990820@163.com>
Date: Mon, 9 Aug 2021 15:12:49 +0800
Subject: [PATCH] liche update for admin auto cars edit do

---
 admin/controllers/auto/Cars.php     |  9 ++-----
 admin/views/auto/cars/get.php       | 38 +++++++++--------------------
 admin/views/auto/cars/lists.php     |  2 +-
 www/admin/static/js/common/admin.js | 14 ++++++++---
 4 files changed, 25 insertions(+), 38 deletions(-)

diff --git a/admin/controllers/auto/Cars.php b/admin/controllers/auto/Cars.php
index 88c2b13b..9c4366a6 100644
--- a/admin/controllers/auto/Cars.php
+++ b/admin/controllers/auto/Cars.php
@@ -131,14 +131,10 @@ class Cars extends HD_Controller{
             $attr_ids = explode('_', $row['attrs']);
             $str_ids = implode(',', $attr_ids);
             $where_attr = array("id in ({$str_ids})" => null);
-            $map_attr = $this->auto_attr_model->map('id', 'title', $where_attr, 'id desc', 0 , 0, 'id, title');
+            $map_attr = $this->auto_attr_model->map('type', 'title', $where_attr, 'id desc', 0 , 0, 'type, title');
             //属性分类
             $attr_types = $this->auto_attr_model->get_type();
-            $attr = "";
-            foreach($attr_ids as $k => $attr_id){
-                $attr .= $map_attr[$attr_id]. "({$attr_types[$k]})-";
-            }
-            $attr = trim($attr, '-');
+            $attr = "{$map_attr[1]}-{$map_attr[0]}-{$map_attr[2]}(内饰)";
             //车系
             $row_sery = $this->auto_series_model->get(array('id' => $row['s_id']));
 
@@ -259,7 +255,6 @@ class Cars extends HD_Controller{
             'price_coplus' => floatval($info['price_coplus']),
             'brokerage_1' => floatval($info['brokerage_1']),
             'brokerage_2' => floatval($info['brokerage_2']),
-            'status' => $info['status'],
         );
 
         $where = array('id' => $info['id']);
diff --git a/admin/views/auto/cars/get.php b/admin/views/auto/cars/get.php
index 953d0c07..4ba026ea 100644
--- a/admin/views/auto/cars/get.php
+++ b/admin/views/auto/cars/get.php
@@ -1,80 +1,64 @@
-<form id="vue-edit" class="am-form am-form-horizontal"  action="/auto/cars/edit"  data-auto="true" method="post" style="width: 90%;padding:25px 30px 20px 0;margin: 0 auto;overflow-y: auto;height: 400px">
+<form id="vue-edit" class="am-form am-form-horizontal"  action="/auto/cars/edit"  data-auto="true" method="post" style="width: 90%;padding:25px 30px 20px 0;margin: 0 auto;">
     <div class="am-form-group">
-        <label class="am-para-label">品牌：</label>
-        <div class="am-para-input">{{info.brand_name}}</div>
+        <label class="am-para-label"></label>
+        <div class="am-para-input f18">{{info.brand_name}} {{info.sery_name}} {{info.attr}}</div>
     </div>
-    <div class="am-form-group">
-        <label class="am-para-label">车系：</label>
-        <div class="am-para-input">{{info.sery_name}}</div>
-    </div>
-    <div class="am-form-group">
-        <label class="am-para-label">属性：</label>
-        <div class="am-para-input">{{info.attr}}</div>
-    </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">裸车报价：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入裸车报价" name="price_car" v-model="info.price_car" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">保险报价：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入保险报价" name="price_insure" v-model="info.price_insure" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">精品报价：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入精品报价" name="price_fine" v-model="info.price_fine" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">金融报价：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入金融报价" name="wx_mchid" v-model="info.price_finance" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">分期首付：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入分期首付" name="first_pay" v-model="info.first_pay" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">公司加价：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入公司加价" name="price_coplus" v-model="info.price_coplus" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">一级佣金：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入一级分销佣金" name="brokerage_1" v-model="info.brokerage_1" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
+    <div class="am-form-group wp50 fl">
         <label class="am-para-label">二级佣金：</label>
         <div class="am-para-input">
             <input type="text" placeholder="请输入二级分销佣金" name="brokerage_2" v-model="info.brokerage_2" style="display: inline;width: 60%"/>
             <span>元</span>
         </div>
     </div>
-    <div class="am-form-group">
-        <label class="am-para-label">状态：</label>
-        <div class="am-para-input wp50">
-            <select name="status" v-model="info.status">
-                <option v-for="(v,i) in statusAry" :value="i">{{v}}</option>
-            </select>
-        </div>
-    </div>
     <div class="am-form-group" style="margin-bottom: 2rem">
         <div class="am-para-input"><button class="am-btn am-btn-secondary" type="button" @click="saveEdit">提交</button></div>
     </div>
diff --git a/admin/views/auto/cars/lists.php b/admin/views/auto/cars/lists.php
index c8c2f3c5..17cd0ad3 100644
--- a/admin/views/auto/cars/lists.php
+++ b/admin/views/auto/cars/lists.php
@@ -63,7 +63,7 @@
                     <td>{{v.attr_title}}</td>
                     <td>{{v.status_name}}</td>
                     <td>
-                        <a href="javascript:void(0);" :data-modal="'auto/cars/get?id='+v.id"
+                        <a href="javascript:void(0);" :data-modal="'auto/cars/get?id='+v.id" data-width="" data-height=""
                            class="am-btn am-btn-primary am-btn-xs">编辑</a>
                         <a :data-update="v.id" data-action="/auto/cars/edit_status" class="am-btn am-btn-danger am-btn-xs"
                            data-field="status" data-value="0" v-if="1==v.status">关闭</a>
diff --git a/www/admin/static/js/common/admin.js b/www/admin/static/js/common/admin.js
index e5171d29..04969f88 100644
--- a/www/admin/static/js/common/admin.js
+++ b/www/admin/static/js/common/admin.js
@@ -204,13 +204,14 @@ $(function () {
             return layer.open({title: title || '窗口', type: 2, area: ['800px', '530px'], fix: true, maxmin: false, content: url});
         };
         // 加载HTML到弹出层
-        this.modal = function (url, data, title, callback, loading, tips) {
+        this.modal = function (url, data, title, callback, loading, tips, area) {
             this.load(url, data, 'GET', function (res) {
                 if (typeof (res) === 'object') {
                     return $.msg.auto(res);
                 }
+                area = area || '800px';
                 var layerIndex = layer.open({
-                    type: 1, btn: false,shadeClose: true, area: "800px", content: res, title: title || '', success: function (dom, index) {
+                    type: 1, btn: false,shadeClose: true, area: area, content: res, title: title || '', success: function (dom, index) {
                         $(dom).find('[data-close]').off('click').on('click', function () {
                             if ($(this).attr('data-confirm')) {
                                 var confirmIndex = $.msg.confirm($(this).attr('data-confirm'), function () {
@@ -643,7 +644,14 @@ $(function () {
 
     /*! 注册 data-modal 事件行为 */
     $body.on('click', '[data-modal]', function () {
-        return $.form.modal($(this).attr('data-modal'), 'open_type=modal', $(this).attr('data-title') || '编辑');
+        var width = $(this).attr('data-width') || '800px';
+        var height = $(this).attr('data-height');
+        if(undefined != width && undefined != height){
+            var area = [width, height];
+        } else if (undefined == width){
+            area = width;
+        }
+        return $.form.modal($(this).attr('data-modal'), 'open_type=modal', $(this).attr('data-title') || '编辑', null, null ,null, area);
     });
 
     /*! 注册 data-open 事件行为 */