7.4(优化

.env.development

@@ -8,7 +8,7 @@ ENV = 'development'
 # 花花
 # VUE_APP_BASE_API = 'http://192.168.31.16:8080/car_admin_api'
 # 薛磊
- VUE_APP_BASE_API = 'http://192.168.0.125:8080/car_admin_api'
+ VUE_APP_BASE_API = 'http://192.168.31.226:8080/car_admin_api'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
 # It only does one thing by converting all import() to require().

src/api/rentsell.js

@@ -132,4 +132,7 @@ export const carBuyWayHelpDeleteAPI = (id) => request.post(`/admin/platform/car/
 export const carBuyWayHelpInfoAPI = (id) => request.get(`/admin/platform/car/buy/way/info/${id}`);
 
 //购车方案修改 /api/admin/platform/car/buy/way/update
-export const carBuyWayHelpUpdateAPI = (data) => request.post(`/admin/platform/car/buy/way/update`, data);
+export const carBuyWayHelpUpdateAPI = (data) => request.post(`/admin/platform/car/buy/way/update`, data);
+
+//租车商品详情 /api/admin/platform/car/information/product/info/{{id}}
+export const carProductInfoAPI = (id) => request.get(`/admin/platform/car/information/product/info/${id}`);

src/api/reservation/settlement.js

@@ -1,7 +1,7 @@
 import request from '@/utils/request';
 
 // 工单结算分页列表   /api/admin/platform/reservation/reply/list
-export const settlementAPI = (params) => request.get('/admin/platform/car/reservation/order/settlement/list', params);
+export const settlementAPI = (params) => request.get('/admin/platform/car/reservation/order/settlement/list',{params});
 
 // 工单结算   /api/admin/platform/car/reservation/order/settlement/update
 export const settlementUpdateAPI = (data) => request.post('/admin/platform/car/reservation/order/settlement/update', data );

src/router/modules/order.js

@@ -29,18 +29,7 @@ const orderRouter = {
       name: 'integralorderList',
       meta: { title: '积分商品订单' },
     },
-    {
+   
-      path: 'sellcar/list',
-      component: () => import('@/views/order/sellcar/list'),
-      name: 'sellcar',
-      meta: { title: '买车订单' },
-    },
-    {
-      path: 'buy_cars_refund/list',
-      component: () => import('@/views/order/buy_cars_refund/list'),
-      name: 'buy_cars_refund',
-      meta: { title: '买车退款订单' },
-    },
 
     //     {
     //     path: 'list',

src/router/modules/rentsell.js

@@ -34,6 +34,18 @@ const rentsellRouter = {
           },
           component: () => import('@/views/rentsell/sell/car_comment'),
         },
+        {
+          path: 'sellcar/list',
+          component: () => import('@/views/order/sellcar/list'),
+          name: 'sellcar',
+          meta: { title: '买车订单' },
+        },
+        {
+          path: 'buy_cars_refund/list',
+          component: () => import('@/views/order/buy_cars_refund/list'),
+          name: 'buy_cars_refund',
+          meta: { title: '买车退款订单' },
+        },
         {
           path: 'car_purchase_plan',
           name: 'carPurchasePlan',

src/views/accessory/category/index.vue

@@ -47,7 +47,7 @@
         </el-table-column>
       </el-table>
 
-      <div class="block">
+      <!-- <div class="block">
         <el-pagination
           :page-sizes="[10, 20, 40, 60]"
           :page-size="orderForm.limit"
@@ -57,7 +57,7 @@
           @size-change="handleSizeChange"
           @current-change="pageChange"
         />
-      </div>
+      </div> -->
     </el-card>
 
     <creat-level

src/views/accessory/self/index.vue

@@ -56,7 +56,7 @@
             />
           </template>
         </el-table-column>
-
+        <el-table-column prop="createTime" label="创建时间"></el-table-column>
         <el-table-column label="操作" min-width="120" fixed="right" align="center">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click="quickStockAddBtn(scope.row)">添加库存</el-button>

src/views/car/carBrand/index.vue

@@ -45,7 +45,7 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="sort" label="排序" min-width="120" />
+        <!-- <el-table-column prop="sort" label="排序" min-width="120" /> -->
         <el-table-column prop="createTime" label="创建时间" min-width="120" />
         <el-table-column prop="updateTime" label="更新时间" min-width="120" />
         <el-table-column label="操作" min-width="110" fixed="right" align="center">

src/views/car/carModel/index.vue

@@ -31,7 +31,7 @@
         <el-table-column prop="id" label="ID" min-width="60" />
         <el-table-column prop="name" label="车系" min-width="90"> </el-table-column>
         <el-table-column prop="brandName" label="品牌" min-width="90"> </el-table-column>
-        <el-table-column prop="sort" label="排序" min-width="120" />
+        <!-- <el-table-column prop="sort" label="排序" min-width="120" /> -->
         <el-table-column prop="name" label="显示状态" min-width="90">
           <template slot-scope="scope">
             <el-switch

src/views/coupon/index.vue

@@ -129,7 +129,6 @@
         ref="user"
         class="demo-ruleForm"
         v-loading="loading"
-        destroy-on-close
       >
         <el-table :data="storeList" :row-key="getRowKeys" @selection-change="handleSelectionChange">
           <el-table-column type="selection" reserve-selection width="55"></el-table-column>

src/views/rentsell/carShopList/index.vue

@@ -7,9 +7,9 @@
             <el-form-item label="标题：">
               <el-input v-model.trim="formData.title" placeholder="请输入标题" class="selWidth"> </el-input>
             </el-form-item>
-            <el-form-item label="车牌号：">
+            <!-- <el-form-item label="车牌号：">
               <el-input v-model.trim="formData.brandId" placeholder="请输入品牌号" class="selWidth"> </el-input>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -91,78 +91,40 @@
     </el-card>
     <el-drawer :visible.sync="drawer" size="100%">
       <div class="descriBOX">
-        <el-descriptions title="汽车参数模板详情" :column="2" border>
+        <el-descriptions title="汽车商品详情" :column="2" border>
           <el-descriptions-item label="id">{{ detailObj.id }}</el-descriptions-item>
-          <el-descriptions-item label="品牌号">{{ detailObj.brandId }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="品牌号">{{ detailObj.brandId }}</el-descriptions-item> -->
-          <el-descriptions-item label="品牌名称">{{ detailObj.brandName }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="车商昵称">{{ detailObj.authorName }}</el-descriptions-item> -->
-          <el-descriptions-item label="车辆号">{{ detailObj.modelId }}</el-descriptions-item>
+          <el-descriptions-item label="车商昵称">{{ detailObj.carDealerName }}</el-descriptions-item>
-          <el-descriptions-item label="车辆型号名称">{{ detailObj.modelName }}</el-descriptions-item>
+          <el-descriptions-item label="车商地址">{{ detailObj.carDealerAddress }}</el-descriptions-item>
+          <el-descriptions-item label="每月租金">{{ detailObj.rentalPrice }}</el-descriptions-item>
+          <el-descriptions-item label="创建时间">{{ detailObj.createTime }}</el-descriptions-item>
+          <el-descriptions-item label="修改时间">{{ detailObj.updateTime }}</el-descriptions-item>
           <el-descriptions-item label="标题">{{ detailObj.title }}</el-descriptions-item>
           <el-descriptions-item label="主图">
-            <!-- <img style="width: 40px; height: 40px" :src="detailObj.mainImage" alt=""/> -->
+            <imagePreview :src="detailObj.image" style="width: 40px; height: 40px" />
-            <imagePreview :src="detailObj.mainImage" style="width: 40px; height: 40px" />
           </el-descriptions-item>
-          <el-descriptions-item label="权益图片">
+          <el-descriptions-item label="租期">{{ detailObj.monthRent }}</el-descriptions-item>
-            <!-- <img style="width: 40px; height: 40px" :src="detailObj.equityImage" alt=""/> -->
+          <el-descriptions-item label="型号名称">{{ detailObj.modelName }}</el-descriptions-item>
-            <imagePreview :src="detailObj.equityImage" style="width: 40px; height: 40px" />
+          <el-descriptions-item label="品牌名称">{{ detailObj.brandName }}</el-descriptions-item>
+          <el-descriptions-item label="可租数量">{{ detailObj.rentalQuantity }}</el-descriptions-item>
+          <el-descriptions-item label="车龄">{{ detailObj.carAge }}</el-descriptions-item>
+          <el-descriptions-item label="押金">{{ detailObj.depositMoney }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="公司名称">{{ detailObj.companyName }}</el-descriptions-item> -->
+          <!-- <el-descriptions-item label="车商编码">{{ detailObj.dealerSn }}</el-descriptions-item> -->
+          <!-- <el-descriptions-item label="商户简介">{{ detailObj.intro }}</el-descriptions-item> -->
+          <!-- <el-descriptions-item label="车商电话">{{ detailObj.carDealerPhone }}</el-descriptions-item> -->
+          <el-descriptions-item label="出租数量">{{ detailObj.sales }}</el-descriptions-item>
+          <!-- <el-descriptions-item label="商品主图">
+            <imagePreview :src="detailObj.productImage" style="width: 40px; height: 40px" />
+          </el-descriptions-item> -->
+          <!-- <el-descriptions-item label="订车规则">
+            <imagePreview :src="detailObj.rulesImage" style="width: 40px; height: 40px" />
           </el-descriptions-item>
-          <el-descriptions-item label="图库">
+          <el-descriptions-item label="订车流程">
-            <!-- <img v-for="item in imgArr" style="width: 40px; height: 40px" :src="item" alt="" /> -->
+            <imagePreview :src="detailObj.processImage" style="width: 40px; height: 40px" />
-            <imagePreview v-for="item in imgArr" :src="item" style="width: 40px; height: 40px; margin-right: 5px" />
+          </el-descriptions-item> -->
-          </el-descriptions-item>
-          <el-descriptions-item label="动力类型">{{
-            detailObj.powerType == 0 ? '纯电' : detailObj.powerType == 1 ? '油电' : '纯油'
-          }}</el-descriptions-item>
-          <el-descriptions-item label="最低指导价格">{{ detailObj.minGuidePrice }}</el-descriptions-item>
-          <el-descriptions-item label="最高指导价格">{{ detailObj.maxGuidePrice }}</el-descriptions-item>
-          <el-descriptions-item label="定金">{{ detailObj.depositPrice }}</el-descriptions-item>
-          <el-descriptions-item label="全款金额">{{ detailObj.fullPrice }}</el-descriptions-item>
-          <el-descriptions-item label="月供">{{ detailObj.monthTributePrice }}</el-descriptions-item>
-          <el-descriptions-item label="月供期数">{{ detailObj.monthTribute }}</el-descriptions-item>
-          <el-descriptions-item label="月租">{{ detailObj.monthRentPrice }}</el-descriptions-item>
-          <el-descriptions-item label="月租期数">{{ detailObj.monthRent }}</el-descriptions-item>
-          <el-descriptions-item label="发布">{{ detailObj.isShow == true ? '是' : '否' }}</el-descriptions-item>
-          <el-descriptions-item label="发布数量">{{ detailObj.pulishNum }}</el-descriptions-item>
-          <el-descriptions-item label="商品类型">{{
-            detailObj.isHelp == true ? '助力商品' : '普通商品'
-          }}</el-descriptions-item>
-          <el-descriptions-item label="助力数">{{ detailObj.helpNum }}</el-descriptions-item>
-          <el-descriptions-item label="开始时间">{{ detailObj.startTime }}</el-descriptions-item>
-          <el-descriptions-item label="结束时间">{{ detailObj.stopTime }}</el-descriptions-item>
-          <el-descriptions-item label="详情"><p v-html="detailObj.content"></p></el-descriptions-item>
         </el-descriptions>
-        <div class="tableBox">
-          <p class="pp">内饰外观列表</p>
-          <!-- <el-table :data="detailObj.parameterColorList"> -->
-          <el-table :data="detailObj.colorList">
-            <el-table-column prop="title" label="标题"> </el-table-column>
-            <el-table-column prop="name" label="颜色名称"> </el-table-column>
-            <el-table-column prop="color" label="颜色编码"> </el-table-column>
-            <el-table-column prop="type" label="外观内饰">
-              <template v-slot="{ row }">
-                {{ row.type == 1 ? '外观' : '内饰' }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="imgArr1" label="外观图片">
-              <template slot-scope="scope">
-                <!-- <img v-for="item in imgArr1" style="width: 40px; height: 40px" :src="item" alt="" /> -->
-                <!-- <el-image
-                  v-for="item in scope.row.imgArr1"
-                  :key="item"
-                  style="width: 40px; height: 40px"
-                  :src="item"
-                  fit="fill"
-                ></el-image> -->
-                <imagePreview
-                  v-for="item in scope.row.imgArr1"
-                  :src="item"
-                  style="width: 40px; height: 40px; margin-right: 5px"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column prop="addPrice" label="额外加价格"> </el-table-column>
-          </el-table>
-        </div>
       </div>
     </el-drawer>
    
@@ -205,7 +167,7 @@
 </template>
 
 <script>
-import {productListAPI,productSwitchAPI} from "@/api/rentsell.js"
+import {productListAPI,productSwitchAPI,carProductInfoAPI} from "@/api/rentsell.js"
 export default {
   name: 'sellList',
   components: {  },
@@ -292,7 +254,7 @@ export default {
     },
     infoBtn(row) {
       this.drawer = true;
-      infoSellerAPI(row.id).then((res) => {
+      carProductInfoAPI(row.id).then((res) => {
         // console.log(res, '汽车详情');
         this.detailObj = res;
         this.imgArr = res.image.split(',');

src/views/reservation/settlement/index.vue

@@ -159,6 +159,7 @@ export default {
     // 搜索按钮
     handleQuery() {
       this.queryForm.page = 1;
+      
       this.getList();
     },
     // 重置按钮
@@ -184,6 +185,7 @@ export default {
     // 获取列表
     getList() {
       this.listLoading = true;
+      console.log(this.queryForm);
       settlementAPI(this.queryForm).then((res) => {
         console.log(res);
         this.tableData = res.list;