From 701a78c97a4020db622d03ce064a46f1af4b4f89 Mon Sep 17 00:00:00 2001
From: Hong <1470048117@qq.com>
Date: Fri, 12 Jul 2024 19:13:28 +0800
Subject: [PATCH] =?UTF-8?q?7.12(=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/cardealer/creatMerchant.vue |  4 +++-
 src/views/rentsell/carShopList/index.vue       |  7 +++++--
 src/views/rentsell/sell/carCommodity/index.vue | 11 ++++++++---
 src/views/rentsell/sell/info/creatLevel.vue    |  1 +
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/views/merchant/cardealer/creatMerchant.vue b/src/views/merchant/cardealer/creatMerchant.vue
index df4facf..92f9264 100644
--- a/src/views/merchant/cardealer/creatMerchant.vue
+++ b/src/views/merchant/cardealer/creatMerchant.vue
@@ -399,10 +399,12 @@ export default {
       if (!this.merchantType.length) this.$store.dispatch('merchant/getMerchantType');
       this.loadingFrom = true;
       merchant.cardealerDetail(this.merId).then((res) => {
-        console.log(res.qualificationPicture);
+        console.log(res,res.province,res.city,res.district);
+       
         // JSON.parse(res.qualificationPicture)
         this.$set(res, 'sliderImages', res.qualificationPicture ? JSON.parse(res.qualificationPicture) : []);
         this.dataForm = res;
+        this.dataForm.selectedOptions=[res.province,res.city,res.district]
         this.labelarr = res.keywords.split(',') || [];
         this.loadingFrom = false;
       });
diff --git a/src/views/rentsell/carShopList/index.vue b/src/views/rentsell/carShopList/index.vue
index 462b982..51c82b9 100644
--- a/src/views/rentsell/carShopList/index.vue
+++ b/src/views/rentsell/carShopList/index.vue
@@ -47,8 +47,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="brandName" label="品牌名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="modelName" label="型号名称" width="100px" show-overflow-tooltip></el-table-column>
-
+        <el-table-column prop="modelName" label="系列名称" width="100px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>{{ scope.row.modelName && scope.row.modelName }}</div>
+          </template>
+        </el-table-column>
         <el-table-column prop="powerType" label="动力类型">
           <template v-slot="{ row }">
             {{ row.powerType == 0 ? '纯电' : row.powerType == 1 ? '油电' : '纯油' }}
diff --git a/src/views/rentsell/sell/carCommodity/index.vue b/src/views/rentsell/sell/carCommodity/index.vue
index 9e2aa42..7e65957 100644
--- a/src/views/rentsell/sell/carCommodity/index.vue
+++ b/src/views/rentsell/sell/carCommodity/index.vue
@@ -34,10 +34,14 @@
       <el-table v-loading="listLoading" :data="posterList" style="width: 100%" highlight-current-row
         class="switchTable">
         <el-table-column prop="id" label="ID" width="40px" />
+        <el-table-column label="标题" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <div>{{ scope.row.carSellerProduct && scope.row.carSellerProduct.title }}</div>
+          </template>
+        </el-table-column>
         <el-table-column prop="carDealerName" label="车商名称" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="carBuyWarName" label="买车方案名称" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="carBuyWayName" label="卖车方案名称" show-overflow-tooltip></el-table-column>
         <el-table-column prop="depositPrice" label="定金" width="100px" show-overflow-tooltip></el-table-column>
-
         <el-table-column prop="type" label="类型">
           <template v-slot="{ row }">
             {{ row.type == 0 ? '买车' : row.type == 1 ? '组买灵活' : '买车' }}
@@ -48,7 +52,8 @@
             <div>{{ scope.row.carSellerProduct && scope.row.carSellerProduct.brandName }}</div>
           </template>
         </el-table-column>
-        <el-table-column label="车辆型号名称" show-overflow-tooltip>
+        <!-- <el-table-column prop="modelName" label="系列名称" width="100px" show-overflow-tooltip></el-table-column> -->
+        <el-table-column label="车辆系列名称" show-overflow-tooltip>
           <template slot-scope="scope">
             <div>{{ scope.row.carSellerProduct && scope.row.carSellerProduct.modelName }}</div>
           </template>
diff --git a/src/views/rentsell/sell/info/creatLevel.vue b/src/views/rentsell/sell/info/creatLevel.vue
index 91ce2b4..df5599a 100644
--- a/src/views/rentsell/sell/info/creatLevel.vue
+++ b/src/views/rentsell/sell/info/creatLevel.vue
@@ -428,6 +428,7 @@ export default {
     carModel() {
       carModelAPI().then((res) => {
         this.options = res;
+        console.log( this.options);
       });
     },