story#5314 底部图片修改

story#5314 banner图样式3
story#5314 banner图样式2
2025-04-14 09:25:57 +08:00 · 2025-04-11 18:58:38 +08:00 · 2025-04-11 18:58:38 +08:00 · 2025-04-11 18:38:28 +08:00 · 2025-04-11 13:51:52 +08:00 · 2025-04-11 11:01:47 +08:00
90 changed files with 19065 additions and 478 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,3 +22,4 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+/yarn.lock
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -9,10 +9,14 @@
    "lint": "vue-cli-service lint"
  },
  "dependencies": {
+    "@vant/area-data": "^2.0.0",
    "amfe-flexible": "^2.2.1",
    "axios": "^1.4.0",
    "core-js": "^3.8.3",
+    "dayjs": "^1.8.14",
+    "decimal.js": "^10.4.3",
    "echarts": "^5.2.2",
+    "element-ui": "^2.15.9",
    "less": "^4.1.3",
    "less-loader": "^11.1.3",
    "qs": "^6.11.2",
@ -21,9 +25,7 @@
    "vant": "^2.13.2",
    "vue": "^2.6.14",
    "vue-router": "^3.0.7",
-    "vuex": "^3.6.2",
-    "element-ui": "^2.15.9",
-    "dayjs": "^1.8.14"
+    "vuex": "^3.6.2"
  },
  "devDependencies": {
    "@babel/core": "^7.12.16",
--- a/public/index.html
+++ b/public/index.html
@ -35,7 +35,7 @@
        // VConsole 默认会挂载到 `window.VConsole` 上
        // let vConsole = new window.VConsole();
        (function (doc, win) {
-            console.log("==window.location.pathname===",window.location.pathname)
+            // console.log("==window.location.pathname===",window.location.pathname)
            let docEl = doc.documentElement
            let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
            recalc = function () {
--- a/public/res/privacy.html
+++ b/public/res/privacy.html
@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>免责声明</title>
+    <style>
+        body {
+            font-family: Arial, sans-serif;
+            line-height: 1.6;
+            /*margin: 20px;*/
+            padding: 0;
+            /*background-color: #f9f9f9;*/
+            color: #333;
+        }
+        h3 {
+            text-align: center;
+            /*font-size: 24px;*/
+            margin-bottom: 20px;
+        }
+        h4 {
+            /*font-size: 20px;*/
+            margin-top: 30px;
+            margin-bottom: 10px;
+            color: #555;
+        }
+        p {
+            margin: 10px 0;
+            text-indent: 2em;
+        }
+        ul {
+            margin: 10px 0;
+            padding-left: 40px;
+        }
+        li {
+            margin: 5px 0;
+        }
+        .container {
+            font-size: 14px;
+            padding-bottom: 20px;
+        }
+    </style>
+</head>
+<body>
+<div class="container">
+    <h3>声明</h3>
+    <p>本平台为二手车买卖双方提供免费信息发布服务。在您使用本平台之前，请仔细阅读并理解本免责声明。一旦使用本平台，即视为您已阅读、理解并同意接受本免责声明的所有条款。</p>
+
+    <h4>一、平台性质</h4>
+    <p>1. 本平台仅为信息发布平台，不参与任何二手车交易环节，包括但不限于交易洽谈、合同签订、款项支付、车辆交付等，实际交易价格由买卖双方自行协商确定。</p>
+    <p>2. 本平台不对发布信息的真实性、准确性、完整性、合法性进行任何形式的担保或保证，用户应自行判断信息的真实性并承担由此产生的风险。</p>
+
+    <h4>二、用户责任</h4>
+    <p>1. 用户应保证发布的信息真实、准确、完整、合法，并对其发布的信息承担全部责任。</p>
+    <p>2. 用户不得发布任何虚假、违法、侵权、违反公序良俗的信息，包括但不限于：</p>
+    <ul>
+        <li>虚假车源信息</li>
+        <li>事故车、水泡车、火烧车等存在重大安全隐患的车辆信息</li>
+        <li>盗抢车辆信息</li>
+        <li>侵犯他人知识产权或其他合法权益的信息</li>
+        <li>含有淫秽、色情、赌博、暴力、恐怖等内容的信息</li>
+        <li>其他违反法律法规或平台规则的信息</li>
+    </ul>
+
+    <h4>三、免责条款</h4>
+    <p>1. 因用户发布的信息引起的任何纠纷或损失，本平台不承担任何责任。</p>
+    <p>2. 因不可抗力、计算机病毒、黑客攻击、系统不稳定、用户所在位置、用户关机以及其他任何网络、技术、通信线路等原因造成的服务中断或不能满足用户要求的风险，本平台不承担任何责任。</p>
+    <p>3. 本平台不对用户之间的交易行为承担任何责任，用户应自行承担交易风险。</p>
+
+    <h4>四、其他</h4>
+    <p>1. 本平台有权根据法律法规的变化或平台运营的需要，随时修改本免责声明，并在平台上公布，修改后的内容自公布之日起生效。</p>
+    <p>2. 本免责声明的解释权归中道救援股份有限公司所有。</p>
+
+    <p>请您在使用本平台前务必仔细阅读并理解本免责声明。</p>
+    <p>如果您对本免责声明有任何疑问，请联系我们。</p>
+</div>
+</body>
+</html>
--- a/src/api/kpi.js
+++ b/src/api/kpi.js
@ -27,6 +27,14 @@ export function getDriverStatisticsKpi(data){
    data
  })
 }
+export function querySupplierDriverStatisticsScore(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierDriverStatisticsScore',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
 //   各种详情数据
 export function getKpiDetailsData(data){
  return request({
@ -36,6 +44,24 @@ export function getKpiDetailsData(data){
    data
  })
 }
+// 获取近12个月的服务商数据
+export function getRecentSupplierKpi(data){
+  return request({
+    url: '/supplier/supplierKPI/queryRecentSupplierStatisticsKpi',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
+// 司机分数详情
+export function driverScoreDetail(data){
+  return request({
+    url: '/supplier/supplierKPI/querySupplierDriverStatisticsScore',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
 // 关键词搜索服务商名称
 export function getSupplierId(key) {
  return request({
--- a/src/api/mine.js
+++ b/src/api/mine.js
@ -147,21 +147,29 @@ export function deleteImage(data){
 //开票通知列表
 export function notifyInvoiceList(data){
    return request({
-        url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceList',
+        url:'/order/taskInvoiceBatch/selectPageList',
        method:'POST',
-        contentType:'application/json',
        data
    })
 }
+// contentType:'application/json',
 //开票通知详情
 export function notifyInvoiceDetail(data){
    return request({
-        url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceDetail',
+        url:'/order/taskInvoiceBatch/selectById',
        method:'POST',
-        contentType:'application/json',
        data
    })
 }
+// 关联案件
+export function getOrderListByInvoice(data) {
+    return request({
+        url:'/order/taskOrderCostHisRecord/selectPageList',
+        method:'POST',
+        data
+    })
+}
+
 //  调度app获取新签列表
 export function pageList(data){
    return request({
@ -214,6 +222,83 @@ export function uploadImage(data){
    })
 }

+// 发票上传
+export function uploadInvoice(data){
+    return request({
+        url:'/order/taskInvoiceBatch/saveInvoiceImagesAndIdentify',
+        method:'POST',
+        contentType:'multipart/form-data',
+        data
+    })
+}
+
+// 删除发票
+export function deleteInvoice(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/deleteInfo',
+        method:'POST',
+        contentType:'multipart/form-data',
+        data
+    })
+}
+
+// 生成财务批次
+export function createBatch(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/supplierCreateFinanceBatch',
+        method:'POST',
+        contentType:'application/x-www-form-urlencoded',
+        data,
+        testFlag: true
+    })
+}
+
+// 开票信息列表
+export function getFinanceBatchList(data) {
+    return request({
+        url:'/order/taskInvoiceFinanceBatch/selectFinanceBatchPageList',
+        method:'POST',
+        data,
+    })
+}
+
+// 批次对应发票信息列表
+export function financeInvoiceList(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/selectInvoicePageList',
+        method:'POST',
+        data,
+    })
+}
+
+// 查看发票
+export function selectInvoiceDetailInfo(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/selectInvoiceDetailInfo',
+        method:'POST',
+        data,
+    })
+}
+
+// 填写快递
+export function saveBatchCourierNumber(data) {
+    return request({
+        url:'/order/taskInvoiceBatch/supplierSaveBatchCourierNumber',
+        method:'POST',
+        data,
+    })
+}
+
+// 获取服务商发票信息
+export function getBillingInfo(url, data) {
+    return request({
+          url: url,
+          method:'POST',
+          contentType:'multipart/form-data',
+          data
+    })
+}
+
 // ocr 识别
 export function ocrHandler(data){
    return request({
@ -223,3 +308,12 @@ export function ocrHandler(data){
        data
    })
 }
+///agg-api/tencent-ocr/unifiedOCRWithCompress
+export function unifiedOCRWithCompress(data){
+    return request({
+        url:'/agg-api/tencent-ocr/unifiedOCRWithCompress',
+        method:'POST',
+        contentType:'application/json',
+        data
+    })
+}
--- a/src/api/order.js
+++ b/src/api/order.js
@ -77,3 +77,38 @@ export function updateOrderSettlement(data){
    data
  })
 }
+// 电瓶数量列表
+export function batteryCountList(){
+  return request({
+    url:'/supplierAppV2/dispatchApp/battery/batteryCountList',
+    method:'POST',
+    contentType:'application/json',
+    // data
+  })
+}
+// 电瓶详情
+export function batteryDetailList (data){
+  return request({
+    url:'/supplierAppV2/dispatchApp/battery/batteryDetailList',
+    method:'POST',
+    contentType:'application/json',
+    data
+  })
+}
+
+// 查询未读告知函
+export function selectUnReadNotifyBySupplier() {
+  return request({
+    url: '/supplierManage/correction/notify/selectUnReadNotifyBySupplier',
+    method:'POST',
+  })
+}
+
+// 阅读告知函
+export function correctionHandle(data) {
+  return request({
+    url: '/supplierManage/correction/record/correctionHandle',
+    method:'POST',
+    data
+  })
+}
--- a/src/api/secondHandCar.js
+++ b/src/api/secondHandCar.js
@ -0,0 +1,96 @@
+import request from '@/utils/http'
+// 车源/求购列表
+export function appPageList(data){
+  return request({
+    url: '/toc-user/car-app/appPageList',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}
+// 我的发布列表
+export function minePublishPageList(data){
+  return request({
+    url: '/toc-user/car-app/minePublishPageList',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}
+
+// 审核不通过数量
+export function auditFailCount (data){
+  return request({
+    url: '/toc-user/car-app/auditFailCount ',
+    method:'POST',
+    // contentType: 'application/json',
+    data
+  })
+}
+// 信息详情查询
+export function carInfoDetail(data){
+  return request({
+    url: '/toc-user/car-app/carInfoDetail',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}
+// 发布编辑信息
+export function publishCarInfo(data){
+  return request({
+    url: '/toc-user/car-app/publishCarInfo',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}
+// 用户信息反馈
+export function userFeedback(data){
+  return request({
+    url: '/toc-user/car-app/userFeedback',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}
+//二手车信息擦亮
+export function usedCarPolish(data){
+  return request({
+    url: `/toc-user/car-app/usedCarPolish/${data}`,
+    method:'POST',
+  })
+}
+//二手车信息下架
+export function usedCarRemove(data){
+  return request({
+    url: '/toc-user/car-app/usedCarRemove',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}
+//二手车信息重新上架
+export function usedCarReShelf(data){
+  return request({
+    url: `/toc-user/car-app/usedCarReShelf/${data}`,
+    method:'POST',
+  })
+}
+//审批信息
+export function auditCarInfo(data){
+  return request({
+    url: '/toc-user/car-admin/auditCarInfo',
+    method:'POST',
+    data
+  })
+}
+// 保存信息记录
+export function saveRecord(data){
+  return request({
+    url: '/toc-user/car-record/saveRecord',
+    method:'POST',
+    contentType: 'application/json',
+    data
+  })
+}
--- a/src/assets/icon_upload.png
+++ b/src/assets/icon_upload.png
--- a/src/assets/secondHandCar/11.png
+++ b/src/assets/secondHandCar/11.png
--- a/src/assets/secondHandCar/45angle.png
+++ b/src/assets/secondHandCar/45angle.png
--- a/src/assets/secondHandCar/alreayXiajia.png
+++ b/src/assets/secondHandCar/alreayXiajia.png
--- a/src/assets/secondHandCar/arr_bot_blue.png
+++ b/src/assets/secondHandCar/arr_bot_blue.png
--- a/src/assets/secondHandCar/arr_bottom.png
+++ b/src/assets/secondHandCar/arr_bottom.png
--- a/src/assets/secondHandCar/arr_left.png
+++ b/src/assets/secondHandCar/arr_left.png
--- a/src/assets/secondHandCar/back.png
+++ b/src/assets/secondHandCar/back.png
--- a/src/assets/secondHandCar/bg.png
+++ b/src/assets/secondHandCar/bg.png
--- a/src/assets/secondHandCar/buyCar.png
+++ b/src/assets/secondHandCar/buyCar.png
--- a/src/assets/secondHandCar/checked.png
+++ b/src/assets/secondHandCar/checked.png
--- a/src/assets/secondHandCar/cheyuanBig.png
+++ b/src/assets/secondHandCar/cheyuanBig.png
--- a/src/assets/secondHandCar/cheyuanSmall.png
+++ b/src/assets/secondHandCar/cheyuanSmall.png
--- a/src/assets/secondHandCar/cheyuan_big.png
+++ b/src/assets/secondHandCar/cheyuan_big.png
--- a/src/assets/secondHandCar/delete.png
+++ b/src/assets/secondHandCar/delete.png
--- a/src/assets/secondHandCar/description.png
+++ b/src/assets/secondHandCar/description.png
--- a/src/assets/secondHandCar/description1.png
+++ b/src/assets/secondHandCar/description1.png
--- a/src/assets/secondHandCar/details.png
+++ b/src/assets/secondHandCar/details.png
--- a/src/assets/secondHandCar/expire.png
+++ b/src/assets/secondHandCar/expire.png
--- a/src/assets/secondHandCar/fabuing.png
+++ b/src/assets/secondHandCar/fabuing.png
--- a/src/assets/secondHandCar/icon_saled.png
+++ b/src/assets/secondHandCar/icon_saled.png
--- a/src/assets/secondHandCar/icon_zdOwner.png
+++ b/src/assets/secondHandCar/icon_zdOwner.png
--- a/src/assets/secondHandCar/jiashizheng.jpg
+++ b/src/assets/secondHandCar/jiashizheng.jpg
--- a/src/assets/secondHandCar/mine.png
+++ b/src/assets/secondHandCar/mine.png
--- a/src/assets/secondHandCar/mine_cheyuan.png
+++ b/src/assets/secondHandCar/mine_cheyuan.png
--- a/src/assets/secondHandCar/mine_qiugou.png
+++ b/src/assets/secondHandCar/mine_qiugou.png
--- a/src/assets/secondHandCar/noAudit.png
+++ b/src/assets/secondHandCar/noAudit.png
--- a/src/assets/secondHandCar/nopass.png
+++ b/src/assets/secondHandCar/nopass.png
--- a/src/assets/secondHandCar/one_cheyuan.png
+++ b/src/assets/secondHandCar/one_cheyuan.png
--- a/src/assets/secondHandCar/one_qiugou.png
+++ b/src/assets/secondHandCar/one_qiugou.png
--- a/src/assets/secondHandCar/polish.png
+++ b/src/assets/secondHandCar/polish.png
--- a/src/assets/secondHandCar/qiugouBig.png
+++ b/src/assets/secondHandCar/qiugouBig.png
--- a/src/assets/secondHandCar/qiugouSmall.png
+++ b/src/assets/secondHandCar/qiugouSmall.png
--- a/src/assets/secondHandCar/qiugou_big.png
+++ b/src/assets/secondHandCar/qiugou_big.png
--- a/src/assets/secondHandCar/reshangjia.png
+++ b/src/assets/secondHandCar/reshangjia.png
--- a/src/assets/secondHandCar/revise.png
+++ b/src/assets/secondHandCar/revise.png
--- a/src/assets/secondHandCar/search.png
+++ b/src/assets/secondHandCar/search.png
--- a/src/assets/secondHandCar/sellCar.png
+++ b/src/assets/secondHandCar/sellCar.png
--- a/src/assets/secondHandCar/suggest.png
+++ b/src/assets/secondHandCar/suggest.png
--- a/src/assets/secondHandCar/three.png
+++ b/src/assets/secondHandCar/three.png
--- a/src/assets/secondHandCar/two_desc.png
+++ b/src/assets/secondHandCar/two_desc.png
--- a/src/assets/secondHandCar/two_supply.png
+++ b/src/assets/secondHandCar/two_supply.png
--- a/src/assets/secondHandCar/uncheck.png
+++ b/src/assets/secondHandCar/uncheck.png
--- a/src/assets/secondHandCar/upload.png
+++ b/src/assets/secondHandCar/upload.png
--- a/src/assets/secondHandCar/wait_verify.png
+++ b/src/assets/secondHandCar/wait_verify.png
--- a/src/assets/secondHandCar/xiajia.png
+++ b/src/assets/secondHandCar/xiajia.png
--- a/src/assets/secondHandCar/车辆描述@2x.png
+++ b/src/assets/secondHandCar/车辆描述@2x.png
--- a/src/router/index.js
+++ b/src/router/index.js
@ -2,6 +2,8 @@ import Vue from "vue";
 import VueRouter from "vue-router";
 Vue.use(VueRouter);
 import kpiRouter from './kpi-router'
+import invoiceRouter from "@/router/invoice-router";
+import secondHandRouter from "@/router/second-hand-router";
 const routes = [
    {
      path: '/',
@ -84,15 +86,48 @@ const routes = [
      name: 'invoicingNotify',
      component: () => import('@/views/index/invoicingNotify.vue'),
      meta: {
-        title: '开票通知'
+        title: '工单批次'
      }
    },
+    {
+        path: "/invoiceListInfo",
+        name: 'invoiceListInfo',
+        component: () => import('@/views/index/invoiceListInfo.vue'),
+        meta: {
+            title: '开票信息'
+        }
+    },
+    {
+        path: "/invoiceInfo",
+        name: 'invoiceInfo',
+        component: () => import('@/views/index/invoiceInfo.vue'),
+        meta: {
+            title: '开票信息'
+        }
+    },
    {
        path: "/invoicingDetail",
        name: 'invoicingDetail',
        component: () => import('@/views/index/invoicingDetail'),
        meta: {
-            title: '开票通知详情'
+            title: '工单批次详情'
+        }
+    },
+    {
+        path: "/uploadInvoice",
+        name: 'uploadInvoice',
+        component: () => import('@/views/index/uploadInvoice.vue'),
+        meta: {
+            title: '上传发票',
+            cache: true
+        }
+    },
+    {
+        path: "/showInvoice",
+        name: 'showInvoice',
+        component: () => import('@/views/index/showInvoice.vue'),
+        meta: {
+            title: '查看发票'
        }
    },
    {
@ -151,6 +186,14 @@ const routes = [
            title:'文档资料'
        }
    },
+    {
+        path: '/notificationList',
+        name: 'notificationList',
+        component:()=>import('@/views/index/notificationList'),
+        meta: {
+            title:'告知函'
+        }
+    },
    {
        path: '/caseList',
        name: 'caseList',
@ -215,7 +258,25 @@ const routes = [
            title:'维保申请'
        }
    },
+    {
+        path: '/batteryList',
+        name: 'batteryList',
+        component:()=>import('@/views/battery/batteryList.vue'),
+        meta: {
+            title:'电瓶进销存'
+        }
+    },
+    {
+        path: '/batteryDetail',
+        name: 'batteryDetail',
+        component:()=>import('@/views/battery/batteryDetail.vue'),
+        meta: {
+            title:'电瓶详情'
+        }
+    },
    ...kpiRouter,
+    ...invoiceRouter,
+    ...secondHandRouter,
  ]

 const router = new VueRouter({
--- a/src/router/invoice-router.js
+++ b/src/router/invoice-router.js
@ -0,0 +1,11 @@
+const invoiceRouter = [
+    {
+        path: '/invoiceIndex',
+        name: 'invoiceIndex',
+        component: () => import('@/views/invoice/invoiceIndex'),
+        meta:{
+            title: '道路救援',
+        }
+    },
+]
+export default invoiceRouter
--- a/src/router/second-hand-router.js
+++ b/src/router/second-hand-router.js
@ -0,0 +1,59 @@
+const secondHandCar = [
+    {
+        path: '/indexList',
+        name: 'indexList',
+        component: () => import('@/views/secondHandCar/indexList.vue'),
+        meta:{
+            title: '首页列表',
+        }
+    },
+    {
+        path: '/carSource',
+        name: 'carSource',
+        component: () => import('@/views/secondHandCar/carSource.vue'),
+        meta:{
+            title: '车源发布',
+        }
+    },
+    {
+        path: '/wantBuy',
+        name: 'wantBuy',
+        component: () => import('@/views/secondHandCar/wantBuy.vue'),
+        meta:{
+            title: '求购发布',
+        }
+    },
+    {
+        path: '/forSale',
+        name: 'forSale',
+        component: () => import('@/views/secondHandCar/forSale.vue'),
+        meta:{
+            title: '查看车源',
+        }
+    },
+    {
+        path: '/wantBuySale',
+        name: 'wantBuySale',
+        component: () => import('@/views/secondHandCar/wantBuySale.vue'),
+        meta:{
+            title: '查看求购',
+        }
+    },
+    {
+        path: '/mineRelease',
+        name: 'mineRelease',
+        component: () => import('@/views/secondHandCar/mineRelease.vue'),
+        meta:{
+            title: '我的发布',
+        }
+    },
+    {
+        path: '/privacyComponent',
+        name: 'privacyComponent',
+        component: () => import('@/views/secondHandCar/privacy.vue'),
+        meta:{
+            title: '免责声明',
+        }
+    },
+]
+export default secondHandCar
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@ -45,7 +45,6 @@ select{
  margin-left: 0;
  font-weight: normal;
  font-size: 14px;
-  //@include fontWeightSize(400,14px);
  color: #000000;
 }

--- a/src/utils/http.js
+++ b/src/utils/http.js
@ -1,7 +1,6 @@
 import axios from "axios";
 import qs from 'qs'
 import { Toast } from 'vant'
-// console.log('process.env.VUE_APP_BASE_API', process.env.VUE_APP_BASE_API)

 const service = axios.create({
  baseURL: process.env.VUE_APP_BASE_API,
@ -11,30 +10,26 @@ const service = axios.create({
  timeout: 10000
 })
 const urlParams = new URLSearchParams(window.location.search);
-let token = urlParams.get('token') ;
+let token = urlParams.get('token');
 localStorage.setItem('token', token);
 service.interceptors.request.use(
    config => {
      let reqUrl=config.url
-        // console.log("reqUrl",reqUrl)
      config.data = config.contentType ? config.data : qs.stringify(config.data)
+      if (config.testFlag) {
+        config.data = qs.stringify(config.data, {arrayFormat: 'indices', allowDots: true})
+      }
      config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded'
      let token = localStorage.getItem('token');
      // let token='4099761587129c46b03c9316c9e866c9'
-      // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MTI0NTQ5NTMsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiJDLeS4iua1t-a1i-ivleacjeWKoeWVhiIsInN1cHBsaWVySWQiOjMzMDQxLCJzdXBwbGllclR5cGUiOjIsInVzZXJuYW1lIjoic29uZyIsInVzZXJUeXBlIjoicmVzY3VlQXBwIiwiZGV2aWNlSWQiOiIyMmI0OWNhMjBmOWI4MzMwZDk4NzIxNzNmMzllYTY4YmMiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTcxMjU0MTM1MywiaWF0IjoxNzEyNDU0OTUzfQ.sPU9_OD_TOWcTwqmlawEGyo4mCPrEaRYw2R02gnvYJw'
-      if (reqUrl.includes("/driverApp")) {
-          //  console.log("司机app")
-          config.headers['token'] = `${token}`;
-      } else if(reqUrl.includes("/supplierApp")){
-          // console.log("调度app")
-          config.headers['Authorization'] = `${token}`;
-      }else{
-          config.headers['token'] = `${token}`;
-      }
+      // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJTSEhQWEIiLCJ1c2VySWQiOjU0NzI2LCJuYW1lIjoiI-a1i-ivleWwj-eZveeZvSIsInVzZXJOYW1lIjoiU0hIUFhCIiwic3VwcGxpZXJJZCI6MTAwMDE2NSwiZXhwIjoxNzQ0NTEwNzkwfQ.JPk0OA7slYJN3FIi_uhW4Y0CiWRvl6R1dK8MRTbyhD8'
+       if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
+           config.headers['Authorization'] = `${token}`;
+           config.headers['token'] = `${token}`;
+       }
      return config
    },
    error => {
-      console.log(error)
      return Promise.reject(error)
    }
 )
@ -42,27 +37,17 @@ service.interceptors.request.use(
 service.interceptors.response.use(
    response => {
      const res = response.data
-      // return res //请求响应数据
-      // if(res.code === 401){
-      //     Toast('token不合法或过期')
-      // }else if(){
-      //
-      // }
      if ( res.code === 401 || res.code === 400  || res.code == 500) {
          Toast(res.msg || 'Error')
-          return Promise.reject(new Error(res.msg || 'Error'))
+          return Promise.reject(res.msg)
      } else {
          return res
-        // if( res.code === 200 ) {
-        //   return res.data
-        // } else {
-        //   return res.data
-        // }
      }
    },
    error => {
-      console.log('err' + error)
-      Toast(error.message)
+        if(error.message != 'Network Error'){
+            Toast(error.message)
+        }
      return Promise.reject(error)
    }
 )
--- a/src/utils/myMixins.js
+++ b/src/utils/myMixins.js
@ -1,9 +1,7 @@
+
 export const myMixins = {
  data() {
    return {
-      touchStart: [],
-      touchEnd: [],
-      slideShow: true
    }
  },
  methods: {
@ -35,18 +33,18 @@ export const myMixins = {
      }
    },
    goH5Detail(item,type){//h5传参到app文档资料，培训文档
-      console.log("type",type)
+      // console.log("type",type)
      let data = {
        "action": "goTraining",
        "params": {
-          "id": item.id,
-          // "docType" : type=='培训文档' ? 1 : 2,
+          "id":type == '培训文档' ? Number(1000000+item.id) : item.id,
        }
      };

      let u = navigator.userAgent;
      let isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
      if(isiOS){
+        // console.log("data",data)
        window.webkit.messageHandlers.nativeObject.postMessage(data);
      }else {
        if(type == '培训文档'){
@ -72,12 +70,38 @@ export const myMixins = {
          methods();
        }
        setTimeout(() => {
-          console.log("shengxiaoxi")
          that.noClick = true;
        }, 3000)
      } else {
        // 这里是重复点击的判断
      }
-    }
+    },
+    formatNumber(num) {
+      if (num < 10000) {
+        // 小于 5 位数，显示为 0.x 万
+        return `${(num / 10000).toFixed(1)}`;
+      } else {
+        // 大于或等于 5 位数，显示为 x 万，四舍五入到小数点后一位
+        return `${Math.round(num / 1000) / 10}`;
+      }
+    },
+    isWebFunc(){
+      let res=false
+      var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+      if (!isMobile) {// 是移动端不变
+        res=true
+      }
+      return res
+    },
+    closeParentDialog() {
+      if (window.parent) {
+        const hasListener = window.parent.dispatchEvent(new Event('checkCloseDialog'));
+        if (hasListener) {
+          window.parent.postMessage('closeDialog', '*');
+        } else {
+          window.history.back();
+        }
+      }
+    },
  }
 }
--- a/src/views/battery/batteryDetail.vue
+++ b/src/views/battery/batteryDetail.vue
@ -0,0 +1,138 @@
+<template>
+  <div class="wrap" >
+    <div class="navBar">
+      <van-nav-bar
+          title="已售电瓶"
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="h5GoBack"
+      > </van-nav-bar>
+    </div>
+    <div class="container" v-if="batteryDetailList && batteryDetailList.length>0">
+      <div class="itemWrap" v-for="(item,index) in batteryDetailList" :key="index">
+        <div>
+          <span class="halfOpci">设备号</span>
+          <span class="allOpci">{{ item.productNo }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">品牌</span>
+          <span class="allOpci">{{ item.brand }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">型号</span>
+          <span class="allOpci">{{ item.model }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">售卖人员</span>
+          <span class="allOpci">{{ item.saleName }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">售卖时间</span>
+          <span class="allOpci">{{ item.createTime }}</span>
+        </div>
+      </div></div>
+  </div>
+</template>
+
+<script>
+
+import {myMixins} from "@/utils/myMixins"
+import {batteryDetailList} from  "@/api/order"
+export default {
+  name: "batteryDetail",
+  mixins:[myMixins],
+  data(){
+    return{
+      batteryDetailList:[],
+      isLoading: false,
+      loading: false,
+      brand: '',
+      model:'',
+    }
+  },
+  async mounted() {
+    this.brand = this.$route.params.brand;
+    this.model = this.$route.params.model;
+    await this.getDetailList()
+  },
+  methods:{
+    async getDetailList(){
+      let res = await batteryDetailList({
+        brand:this.brand,
+        model:this.model,
+      })
+      this.batteryDetailList=res.data.reverse();
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+@import "@/styles/common.scss";
+
+.wrap {
+  background: #F4F5F7;
+  @include wh(100%, 100%);
+}
+.navBar{
+  margin-bottom: 46px;
+  .rightWrap{
+    @include wh(50px,20px);
+    border-radius: 10px;
+    opacity: 0.7;
+    border: 1px solid #FFFFFF;
+    @include flexTwoCenter;
+    img{
+      @include widHeiMar(9px,8px,4px);
+    }
+    .addTxt{
+      @include fontWeightSize(bolder,11px);
+      @include colorOpa( #FFFFFF,0.7);
+    }
+  }
+}
+.container{
+  @include wh(100%, calc(100% - 56px));
+  overflow-y: auto;
+  @include sizingPadding(13px,13px);
+}
+.itemWrap {
+  @include wh(100%, 104px);
+  @include radiusSizing(6px);
+  @include fontWeightSize(400, 12px);
+  @include flexBetween;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
+  margin-bottom: 10px;
+  padding: 11px 13px 9px 15px;
+  position: relative;
+  .halfOpci {
+    display: inline-block;
+    width: 60px;
+    opacity: .5;
+    margin-right: 5px;
+  }
+  .allOpci {
+    opacity: 1;
+  }
+  .statusNo {
+    color: #FF0000;
+  }
+  .statusYes {
+    color: #09B820
+  }
+  .img{
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 10px;
+    top: 35%;
+    cursor: pointer;
+  }
+}
+
+</style>
--- a/src/views/battery/batteryList.vue
+++ b/src/views/battery/batteryList.vue
@ -0,0 +1,171 @@
+<template>
+  <div class="wrap" >
+    <div class="navBar">
+      <van-nav-bar
+          title="电瓶进销存"
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="goBack"
+      >
+      </van-nav-bar>
+    </div>
+    <van-field class="input" right-icon="search" v-model="keyword" placeholder="请输入品牌或型号"   @input="filterBatteryList"/>
+    <div class="container" v-if="batteryList && batteryList.length>0">
+      <div class="itemWrap" v-for="(item,index) in batteryList" :key="index">
+        <div>
+          <span class="halfOpci">品牌</span>
+          <span class="allOpci">{{ item.brand }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">型号</span>
+          <span class="allOpci">{{ item.model }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">总量</span>
+          <span class="allOpci">{{ item.totalNum }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">库存数量</span>
+          <span class="allOpci">{{ item.stockNum }}</span>
+        </div>
+        <div>
+          <span class="halfOpci">已售数量</span>
+          <span class="allOpci">{{ item.sellNum }}</span>
+        </div>
+        <img @click="goBatteryDetail(item)" class="img" src="@/assets/arrow_rht.png" />
+      </div>
+    </div>
+    <div class="bgEmptyImg" v-show="show" >
+      <img  src="@/assets/empty.png" />
+    </div>
+  </div>
+</template>
+
+<script>
+
+import {myMixins} from "@/utils/myMixins"
+import {batteryCountList} from  "@/api/order"
+export default {
+  name: "batteryList",
+  mixins:[myMixins],
+  data(){
+    return{
+      batteryList:[],
+      isLoading: false,
+      keyword:'',
+    }
+  },
+  computed:{
+    show() {
+      return (this.batteryList.length < 0 || this.batteryList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+  mounted() {
+    this.getList()
+  },
+  methods:{
+    async filterBatteryList(){
+      await this.getList()
+      this.batteryList = this.batteryList.filter(item =>
+          item.brand.includes(this.keyword) || item.model.includes(this.keyword)
+      );
+    },
+    goBatteryDetail(item){//电瓶详情
+      this.$router.push({
+        name: "batteryDetail",
+        params: {
+          brand: item.brand,
+          model: item.model,
+        }
+      })
+    },
+    async getList(){
+      let res = await batteryCountList()
+      this.batteryList=res.data
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+@import "@/styles/common.scss";
+
+.wrap {
+  background: #F4F5F7;
+  @include wh(100%, 100%);
+}
+.navBar{
+  margin-bottom: 46px;
+  .rightWrap{
+    @include wh(50px,20px);
+    border-radius: 10px;
+    opacity: 0.7;
+    border: 1px solid #FFFFFF;
+    @include flexTwoCenter;
+    img{
+      @include widHeiMar(9px,8px,4px);
+    }
+    .addTxt{
+      @include fontWeightSize(bolder,11px);
+      @include colorOpa( #FFFFFF,0.7);
+    }
+  }
+}
+.input{
+  //@include sizingPadding(13px,13px);
+  //margin: 13px 0;
+}
+.container{
+  @include sizingPadding(13px,13px);
+  overflow-y: auto;
+  @include wh(100%, calc(100% - 96px));
+}
+
+.itemWrap {
+  @include wh(100%, 104px);
+  @include radiusSizing(6px);
+  @include fontWeightSize(400, 12px);
+  @include flexBetween;
+  background: #FFFFFF;
+  box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
+  margin-bottom: 10px;
+  padding: 11px 13px 9px 15px;
+  position: relative;
+  //margin-top: 10px;
+  .halfOpci {
+    display: inline-block;
+    width: 60px;
+    opacity: .5;
+    margin-right: 5px;
+  }
+  .allOpci {
+    opacity: 1;
+  }
+  .statusNo {
+    color: #FF0000;
+  }
+  .statusYes {
+    color: #09B820
+  }
+  .img{
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    right: 10px;
+    top: 35%;
+    cursor: pointer;
+  }
+}
+.bgEmptyImg{
+  @include flexTwoCenter;
+  height: 90% ;
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+</style>
--- a/src/views/documentView/diverTrainDocment.vue
+++ b/src/views/documentView/diverTrainDocment.vue
@ -101,6 +101,7 @@ export default {
    const urlParams = new URLSearchParams(window.location.search);
    this.driverId = urlParams.get('driverId');
    this.time=timeFormat(Date.now())
+    this.keyword=urlParams.get('keyWord') || ''
    this.getTrainingList();
    document.addEventListener('visibilitychange', async (  ) => {
      let state = document.visibilityState
--- a/src/views/documentView/docmentList.vue
+++ b/src/views/documentView/docmentList.vue
@ -103,6 +103,9 @@ export default {
    const urlParams = new URLSearchParams(window.location.search);
    this.supplierId = urlParams.get('supplierId');
    this.driverId = urlParams.get('driverId');
+    if(this.driverId){
+      this.keyword=urlParams.get('keyWord') || ''
+    }
    this.getNormalList()
  },
  methods:{
--- a/src/views/index/invoiceInfo.vue
+++ b/src/views/index/invoiceInfo.vue
@ -0,0 +1,344 @@
+<template>
+  <div class="wrap">
+    <div class="navBar">
+      <van-nav-bar
+        title="开票信息"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="h5GoBack"
+      />
+    </div>
+    <div class="contentWrap">
+      <div class="content_tab">
+        <div class="tab_title">批次信息</div>
+        <div class="tab_content">
+          <div class="item_wrap">
+            <div class="item_label">财务编号</div>
+            <div class="item_content">
+              <span id="copyText">{{invoiceInfo.financeBatchCode}}</span>
+              <img class="copyIcon" @click="copyHandler(invoiceInfo.financeBatchCode)" src="@/assets/copy.png" />
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">工单数量</div>
+            <div class="item_content">
+              {{invoiceInfo.orderNum}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">总金额</div>
+            <div class="item_content">
+              {{invoiceInfo.totalMoney}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">扣款</div>
+            <div class="item_content">
+              {{invoiceInfo.cutMoney || ''}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">税额扣款</div>
+            <div class="item_content">
+              {{invoiceInfo.taxCutMoney || ''}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">开票金额</div>
+            <div class="item_content">
+              {{invoiceInfo.invoiceMoney || ''}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">备注</div>
+            <div class="item_content">
+              {{invoiceInfo.remark || ''}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">失败原因</div>
+            <div class="item_content">
+              {{invoiceInfo.failRemark || ''}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">创建时间</div>
+            <div class="item_content">
+              {{invoiceInfo.createTime}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">对账状况</div>
+            <div class="item_content">
+              {{ statusStr(invoiceInfo.status, invoiceInfo.createTime) }}
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="content_tab mt10">
+        <div class="tab_title">发票信息</div>
+        <div class="itemWrap" v-for="(item,index) in invoiceList" :key="index">
+          <div class="item line1">
+            <div class="title own_title">{{item.accountName}}</div>
+            <div class="checkBtn" @click="goShowInvoice(item)">查看</div>
+          </div>
+          <div class="item">
+            <span class="title">发票号码:</span>
+            <span class="content">{{item.financeBatchCode}}</span>
+          </div>
+          <div class="item">
+            <span class="title">发票金额:</span>
+            <span class="content">￥{{item.invoiceMoney}}元</span>
+          </div>
+          <div class="item">
+            <span class="title">开票日期:</span>
+            <span class="content">{{ item.invoiceDate }}</span>
+          </div>
+        </div>
+      </div>
+
+      <div class="content_tab mt10">
+        <div class="tab_title">快递信息</div>
+        <div class="itemWrap bg_cls pd_cls">
+          <div class="item mb10">
+            <span class="title width_cls">发票类型:</span>
+            <span class="content">
+              <van-radio-group v-model="invoiceType" disabled direction="horizontal">
+                <van-radio :name="1" icon-size="16px">电子发票</van-radio>
+                <van-radio :name="2" icon-size="16px">纸质发票</van-radio>
+              </van-radio-group>
+            </span>
+          </div>
+          <div class="item">
+            <span class="title width_cls">补录快递单号:</span>
+            <span class="content" style="flex: 1">
+              <van-field v-model="courierNumber" label="" />
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div class="invoice_btn_wrap">
+        <div class="btn" @click="saveHandler">保存</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {myMixins} from "@/utils/myMixins"
+  import { financeInvoiceList, selectInvoiceDetailInfo, saveBatchCourierNumber } from  "@/api/mine"
+  import {Dialog} from "vant";
+  export default {
+    name: "invoiceInfo",
+    mixins: [ myMixins ],
+    data() {
+      return {
+        invoiceInfo: {},
+        invoiceList: [],
+        invoiceType: '',
+        courierNumber: '',
+        id: ''
+      }
+    },
+    async mounted() {
+      let showItemInfo = localStorage.getItem('showItemInfo');
+      this.invoiceInfo = showItemInfo ? JSON.parse(showItemInfo) : {};
+      console.log('this.invoiceInfo', this.invoiceInfo)
+      this.invoiceType = this.invoiceInfo.invoiceType
+      this.id = this.$route.query.id;
+      await this.getInvoiceHandler()
+    },
+    methods: {
+      async saveHandler() {
+        await saveBatchCourierNumber({
+          invoiceBatchId: this.id,
+          courierNumber: this.courierNumber,
+        })
+        Dialog.alert({
+          title: '提示',
+          message: '操作成功!',
+        }).then(() => {
+          this.h5GoBack()
+        });
+      },
+      async goShowInvoice(item) {
+        let res = await selectInvoiceDetailInfo({
+          id: item.id
+        })
+        localStorage.setItem('invoiceDetail', JSON.stringify(res.data));
+        this.goPage('showInvoice')
+      },
+      statusStr(status,date) {
+        if(new Date('2024-01-01 00:00:00') > new Date(date)){
+          return ''
+        }
+        if( status == 1 ) {
+          return '待审核'
+        } else if( [2 ,3].includes(status)) {
+          return '审核通过'
+        } else if( status == 7 ) {
+          return '审核失败'
+        } else if( status == 4 ) {
+          return '已打款'
+        } else if( status == 8 ) {
+          return '打款中'
+        } else {
+          return ''
+        }
+      },
+      async getInvoiceHandler() {
+        let res = await financeInvoiceList({
+          current: 1,
+          pageSize: 1000,
+          total: 0,
+          pageNum: 1,
+          invoiceBatchId: this.id
+        });
+        this.invoiceList = res.data;
+        console.log('current', res)
+      },
+      copyHandler(copyText){
+        let inputNode = document.createElement('input')  // 创建input
+        inputNode.value = copyText // 赋值给 input 值
+        document.body.appendChild(inputNode) // 插入进去
+        inputNode.select() // 选择对象
+        document.execCommand('Copy') // 原生调用执行浏览器复制命令
+        inputNode.className = 'oInput'
+        inputNode.style.display = 'none' // 隐藏
+        this.$toast('复制成功')
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .wrap{
+    @include wh(100%,100%);
+    background-color: #F4F5F7;
+    overflow-y: auto;
+    box-sizing: border-box;
+  }
+  .navBar{
+    margin-bottom: 46px;
+  }
+
+  .contentWrap{
+    .content_tab {
+      background-color: #fff;
+      width: 100%;
+      padding: 15px 15px;
+      box-sizing: border-box;
+      .tab_title {
+        font-size: 14px;
+        font-weight: bold;
+        margin-bottom: 5px;
+      }
+      .tab_content {
+        .item_wrap {
+          display: flex;
+          align-items: center;
+          line-height: 26px;
+          font-size: 12px;
+          .item_label {
+            color: rgba(0,0,0,0.5);
+            margin-right: 5px;
+            width: 60px;
+          }
+          .item_content {
+            display: flex;
+            align-items: center;
+          }
+        }
+      }
+    }
+  }
+  .copyIcon {
+    width: 35px;
+    height: 15px;
+    margin-left: 10px
+  }
+
+  .itemWrap{
+    /*background: #FFFFFF;*/
+    background-color: #EBF2F7;
+    padding: 10px 20px;
+    border: 1px solid #EBF2F7;
+    border-radius: 4px;
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    line-height: 26px;
+    @include flexBetween;
+    margin-bottom: 10px;
+    .line1{
+      width: 100%;
+      @include flexColBet;
+      .checkBtn{
+        @include bgFontColor(#FFFFFF,#354D93);
+        @include wh(48px,18px);
+        border-radius: 3px;
+        line-height: 18px;
+        text-align: center;
+      }
+    }
+  }
+  .item{
+    display: flex;
+    @include fontWeightSize(400,12px);
+    span{
+      display: inline-block;
+    }
+    .title{
+      opacity: 0.5;
+      margin-right: 5px;
+    }
+    .own_title {
+      font-weight: bold;
+      font-size: 14px;
+      opacity: 1;
+    }
+  }
+  .mt10 {
+    margin-top: 10px;
+  }
+  .bg_cls {
+    background-color: #fff;
+  }
+  .pd_cls {
+    padding-top: 15px;
+    padding-bottom: 15px;
+  }
+  ::v-deep .van-cell {
+    padding: 0;
+    border: 1px solid #EBF2F7;
+  }
+  .width_cls {
+    width: 80px;
+  }
+  .invoice_btn_wrap {
+    width: 100%;
+    padding: 20px;
+    box-sizing: border-box;
+    background-color: #fff;
+    .btn {
+      width: 100%;
+      background-color: #2C395F;
+      color: #fff;
+      padding: 15px 0;
+      text-align: center;
+      border-radius: 6px;
+    }
+  }
+  .mb10 {
+    margin-bottom: 10px;
+  }
+  ::v-deep .van-radio__icon {
+    margin-right: 10px;
+  }
+</style>
--- a/src/views/index/invoiceListInfo.vue
+++ b/src/views/index/invoiceListInfo.vue
@ -0,0 +1,262 @@
+<template>
+  <div class="wrap">
+    <div class="navBar">
+      <van-nav-bar
+        title="开票信息"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="goBack"
+      />
+    </div>
+    <div class="search_wrap">
+      <div class="search_left">
+        <el-select v-model="form.statusValue" size="mini" clearable placeholder="请选择审核状态">
+          <el-option
+            v-for="item in statusValueOptions"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </div>
+      <div class="search_right">
+        <van-search
+          v-model="form.financeBatchCode"
+          show-action
+          placeholder="请输入搜索关键词"
+          @search="onSearch"
+        >
+          <template #action>
+            <div @click="onSearch">搜索</div>
+          </template>
+        </van-search>
+      </div>
+    </div>
+    <div class="contentWrap">
+      <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+        <van-list
+          v-model="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="getMore"
+        >
+          <div class="itemWrap" v-for="(item,index) in invoiceList" :key="index">
+            <div class="item line1">
+              <div class="itemTime">
+                <span class="title">开票编号:</span>
+                <span class="content">{{ item.financeBatchCode }}</span>
+              </div>
+              <div class="checkBtn" @click="getInvoiceInfo(item)">查看</div>
+            </div>
+            <div class="item">
+              <span class="title">工单数量:</span>
+              <span class="content">{{ item.orderNum }}</span>
+            </div>
+            <div class="item">
+              <span class="title">开票金额:</span>
+              <span class="content">{{ item.invoiceMoney || 0 }}元</span>
+            </div>
+            <div class="item">
+              <span class="title">创建时间:</span>
+              <span class="content">{{ item.createTime }}</span>
+            </div>
+            <div class="item">
+              <span class="title">对账状态:</span>
+              <span class="content">{{ statusStr(item.status, item.createTime) }}</span>
+            </div>
+          </div>
+        </van-list>
+      </van-pull-refresh>
+
+    </div>
+  </div>
+</template>
+
+<script>
+  import { myMixins } from "@/utils/myMixins"
+  import { getFinanceBatchList } from  "@/api/mine"
+  export default {
+    name: "invoiceListInfo",
+    mixins: [ myMixins ],
+    data() {
+      return {
+        form: {
+          statusValue: '',
+          financeBatchCode: '',
+          statusList: [],
+        },
+        invoiceList: [],
+        isLoading: false,
+        loading: false,
+        finished: false,
+        page: {
+          current: 1,
+          pageSize: 10,
+          total: 0,
+          pageNum: 1,
+        },
+        supplierId: '',
+        statusValueOptions:[{name:'待审核',value:1},{name:'审核通过待打款',value: 2},{name:'审核失败',value: 3},{name:'打款中',value: 4},{name:'已打款',value: 5}],
+      }
+    },
+    watch:{
+      async 'form.statusValue' (){
+        if( this.form.statusValue == 1 ) {
+          this.form.statusList = [1]
+        } else if( this.form.statusValue == 2 ) {
+          this.form.statusList = [2, 3]
+        } else if( this.form.statusValue == 3 ) {
+          this.form.statusList = [7]
+        } else if( this.form.statusValue == 4 ) {
+          this.form.statusList = [8]
+        } else if( this.form.statusValue == 5 ) {
+          this.form.statusList = [4]
+        } else {
+          this.form.statusList = []
+        }
+      }
+    },
+    async mounted() {
+      this.supplierId = this.$route.query.supplierId;
+    },
+    methods: {
+      async onSearch() {
+        this.page.pageNum=1;
+        await this.getList()
+      },
+      onRefresh() {
+        this.page.pageNum=1;
+        this.getList();
+        setTimeout(() => {
+          this.$toast('刷新成功');
+          this.isLoading = false;
+        }, 1000);
+      },
+      async getMore(){
+        await this.getList()
+        this.page.pageNum++;
+        // 加载状态结束
+        this.loading = false;
+        // 数据全部加载完成
+        if (this.invoiceList.length >= this.page.total) {
+          this.finished = true;
+        }
+      },
+      async getList() {
+        let res = await getFinanceBatchList({
+          ...this.page,
+          ...this.form,
+          supplierId: this.supplierId
+        });
+        if(res.code == 200){
+          this.page.total = res.total;
+          if(this.page.pageNum == 1){
+            this.invoiceList = res.data;
+          }else{
+            let preList = this.invoiceList;
+            let arr = res.data;
+            this.invoiceList = preList.concat(arr)
+          }
+          if (this.invoiceList.length === 0) {
+            this.show=true
+          }else{
+            this.show=false
+          }
+        }
+      },
+      getInvoiceInfo(item) {
+        localStorage.setItem('showItemInfo', JSON.stringify(item));
+        this.goPage('invoiceInfo', {
+          id: item.id
+        })
+      },
+      statusStr(status,date) {
+        if(new Date('2024-01-01 00:00:00') > new Date(date)){
+          return ''
+        }
+        if( status == 1 ) {
+          return '待审核'
+        } else if( [2 ,3].includes(status)) {
+          return '审核通过'
+        } else if( status == 7 ) {
+          return '审核失败'
+        } else if( status == 4 ) {
+          return '已打款'
+        } else if( status == 8 ) {
+          return '打款中'
+        } else {
+          return ''
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .wrap{
+    @include wh(100%,100%);
+    background-color: #F4F5F7;
+    overflow-y: auto;
+    box-sizing: border-box;
+  }
+  .navBar{
+    margin-bottom: 46px;
+  }
+  .contentWrap {
+    background-color: #F4F5F7;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px;
+  }
+  .search_wrap {
+    display: flex;
+    align-items: center;
+    padding-left: 10px;
+    background-color: #fff;
+    .search_left {
+      width: 100px;
+      font-size: 12px;
+    }
+    .search_right {
+      flex: 1;
+    }
+  }
+
+  .itemWrap{
+    background: #FFFFFF;
+    position: relative;
+    width: 100%;
+    box-sizing: border-box;
+    padding: 15px;
+    border-radius: 6px;
+    line-height: 26px;
+    @include flexBetween;
+    margin-bottom: 10px;
+    .item{
+      @include fontWeightSize(400,12px);
+      span{
+        display: inline-block;
+      }
+      .title{
+        opacity: .5;
+        margin-right: 5px;
+      }
+    }
+    .line1{
+      width: 100%;
+      @include flexColBet;
+      .checkBtn{
+        @include bgFontColor(#FFFFFF,#354D93);
+        @include wh(48px,18px);
+        border-radius: 3px;
+        line-height: 18px;
+        text-align: center;
+      }
+    }
+  }
+</style>
--- a/src/views/index/invoicingDetail.vue
+++ b/src/views/index/invoicingDetail.vue
@ -2,7 +2,7 @@
 <div class="wrap">
  <div class="navBar">
    <van-nav-bar
-        title="开票通知详情"
+        title="工单批次详情"
        left-arrow
        left-arrow-color="#FFFFFF"
        :border="false"
@ -12,52 +12,143 @@
    />
  </div>
  <div class="contentWrap">
-      <div class="item" v-for="(item,index) in detailList" :key="index">
-        <div class="itemContent">
-          <span> {{ item.orderCode }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <span>{{ item.serviceName }}</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <span> {{item.settleAmount}}元</span>
-            </div>
-        <div class="line"></div>
+    <div class="content_tab">
+      <div class="tab_title">批次详情</div>
+      <div class="tab_content">
+        <div class="item_wrap">
+          <div class="item_label">批次编号</div>
+          <div class="item_content">
+            <span id="copyText">{{invoiceInfo.batchCode}}</span>
+            <img class="copyIcon" @click="copyHandler(invoiceInfo.batchCode)" src="@/assets/copy.png" />
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">财务编号</div>
+          <div class="item_content">
+            <span id="copyText2">{{invoiceInfo.financeBatchCode}}</span>
+            <img class="copyIcon" @click="copyHandler(invoiceInfo.financeBatchCode)" src="@/assets/copy.png" />
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">工单数量</div>
+          <div class="item_content">
+            {{invoiceInfo.orderNum}}
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">总金额</div>
+          <div class="item_content">
+            {{invoiceInfo.orderNum}}
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">扣款</div>
+          <div class="item_content">
+            {{invoiceInfo.cutMoney || ''}}
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">税额扣款</div>
+          <div class="item_content">
+            {{invoiceInfo.taxCutMoney || ''}}
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">开票金额</div>
+          <div class="item_content">
+            {{invoiceInfo.invoiceMoney || ''}}
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">备注</div>
+          <div class="item_content">
+            {{invoiceInfo.remark || ''}}
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">创建时间</div>
+          <div class="item_content">
+            {{invoiceInfo.createTime}}
+          </div>
+        </div>
+        <div class="item_wrap">
+          <div class="item_label">对账状况</div>
+          <div class="item_content">
+            {{invoiceInfo.statusString}}
+          </div>
+        </div>
      </div>
+    </div>
+    <div class="content_tab mt_cls">
+      <div class="tab_title">关联案件</div>
+      <table>
+        <tr>
+          <th class="text_left">案件编号</th>
+          <th>服务类型</th>
+          <th>结算类型</th>
+        </tr>
+        <tr v-for="(item, index) in orderList" :key="index">
+          <td class="text_left">
+            {{item.orderCode}}
+            <img class="copyIcon" @click="copyHandler(item.orderCode)" src="@/assets/copy.png" />
+          </td>
+          <td>{{item.serviceType || ''}}</td>
+          <td>{{item.settleAmount || ''}}</td>
+        </tr>
+      </table>
+    </div>
  </div>
 </div>
 </template>

 <script>
 import {myMixins} from "@/utils/myMixins"
-import {notifyInvoiceDetail} from "@/api/mine"
+import { notifyInvoiceDetail, getOrderListByInvoice } from  "@/api/mine"
 export default {
  name: "invoicingDetail",
  mixins:[myMixins],
  data(){
    return{
-      pageNum:1,
-      pageSize:10,
-      detailList:[],
-      form:{
-        batchCode:'',
-        startTime:'',
-        overTime:'',
-      }
+      batchCode: '',
+      id: '',
+      invoiceInfo: {},
+      orderList: [],
    }
  },
  async mounted() {
-    // console.log(this.$route.query?.id)
-    this.form.batchCode=this.$route.query?.id;
-    this.form.startTime=this.$route.query?.startTime;
-    this.form.overTime=this.$route.query?.overTime;
+    this.batchCode = this.$route.query?.batchCode;
+    this.id = this.$route.query?.id;
    await this.getDetail()
+    await this.getOrderList();
  },
  methods:{
-      async getDetail(){
-        let res=await notifyInvoiceDetail({
-          pageNum:this.pageNum,
-          pageSize:this.pageSize,
-         ...this.form,
-        })
-        this.detailList=res.data
-      }
+    copyHandler(copyText){
+      let inputNode = document.createElement('input')  // 创建input
+      inputNode.value = copyText // 赋值给 input 值
+      document.body.appendChild(inputNode) // 插入进去
+      inputNode.select() // 选择对象
+      document.execCommand('Copy') // 原生调用执行浏览器复制命令
+      inputNode.className = 'oInput'
+      inputNode.style.display = 'none' // 隐藏
+      this.$toast('复制成功')
+    },
+    async getOrderList() {
+      let res = await getOrderListByInvoice({
+        batchCode: this.batchCode,
+        pageSize: 1000,
+        pageNum: 1,
+        createTime: this.invoiceInfo.startTime
+      })
+      this.orderList = res.data;
+      console.log('rerere', res);
+    },
+    async getDetail(){
+      let res = await notifyInvoiceDetail({
+        id: this.id
+      })
+      this.invoiceInfo = res.data
+      console.log('rerere', res)
+    }
  }
 }
 </script>
@ -67,26 +158,62 @@ export default {
@import "@/styles/common.scss";
 .wrap{
  @include wh(100%,100%);
+  background-color: #F4F5F7;
 }
 .navBar{
  height: 46px;
 }
 .contentWrap{
-  @include wh(100%,400px);
-  margin-left: 27px;
-  .item{
+  .mt_cls {
+    margin-top: 10px;
+  }
+  .content_tab {
+    background-color: #fff;
    width: 100%;
-    @include all-height(47px);
-    .itemContent{
-      margin-left: 5px;
-      color: #323643;
-      @include fontWeightSize(400,13px);
+    padding: 15px 15px;
+    box-sizing: border-box;
+    .tab_title {
+      font-size: 14px;
+      font-weight: bold;
+      margin-bottom: 5px;
    }
-    .line{
-      @include wh(100%,1px);
-      @include bgcolorOpa(#E9E9EA,0.6);
+    .tab_content {
+      .item_wrap {
+        display: flex;
+        align-items: center;
+        line-height: 30px;
+        font-size: 12px;
+        .item_label {
+          color: rgba(0,0,0,0.5);
+          margin-right: 5px;
+          width: 60px;
+        }
+        .item_content {
+          display: flex;
+          align-items: center;
+        }
+      }
+    }
+    table {
+      line-height: 30px;
+      width: 100%;
+      .text_left {
+        text-align: left;
+        width: 50%;
+      }
+      th {
+        color: rgba(0, 0, 0, 0.5);
+      }
+      td {
+        text-align: center;
+      }
    }
  }
 }
+  .copyIcon {
+    width: 35px;
+    height: 15px;
+    margin-left: 10px
+  }

-</style>
+</style>
--- a/src/views/index/invoicingNotify.vue
+++ b/src/views/index/invoicingNotify.vue
@ -2,7 +2,7 @@
 <div class="wrap">
  <div class="navBar">
    <van-nav-bar
-        title="开票通知"
+        title="工单批次"
        left-arrow
        left-arrow-color="#FFFFFF"
        :border="false"
@ -11,41 +11,74 @@
        @click-left="goBack"
    />
  </div>
-  <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
-    <div class="itemWrap" v-for="(item,index) in notifyList" :key="index" >
-      <div class="item line1">
-        <div class="itemTime">
-          <span class="title">开票月份:</span>
-          <span class="content">{{ item.invoiceMonth }}</span>
-        </div>
-        <div class="orderNum">
-          <span class="title">总案件数:</span>
-          <span class="content">{{ item.orderNum }}</span>
-        </div>
-        <div class="checkBtn" @click="goPage('invoicingDetail',{id:item.batchCode,startTime:item.startTime,overTime:item.overTime})">查看 </div>
-      </div>
-      <div class="item">
-        <span class="title">批次号:</span>
-        <span class="content">{{ item.batchCode }}</span>
-      </div>
-      <div class="item">
-        <span class="title">结算总金额:</span>
-        <span class="content">{{ item.totalMoney + '元' }}</span>
-      </div>
-      <div class="item">
-        <span class="title">扣款金额:</span>
-        <span class="content">{{ item.cutMoney + '元'}}</span>
-      </div>
-      <div class="item">
-        <span class="title">扣款原因:</span>
-        <span class="content"  style="color: #FF8F37;">{{ item.remark }}</span>
-      </div>
-      <div class="item">
-        <span class="title">最终开票金额:</span>
-        <span class="content">{{ item.invoiceMoney+ '元' }}</span>
-      </div>
+  <van-tabs v-model="active" sticky @click="changeTabHandler" background="#2C395F" color="#ffffff" title-active-color="#ffffff" title-inactive-color="#BDC1CD">
+    <van-tab title="全部" name="1"></van-tab>
+    <van-tab title="未开票" name="2"></van-tab>
+    <van-tab title="已开票" name="3"></van-tab>
+  </van-tabs>
+  <div class="content_wrap" :class="{ 'pd_cls': active == 2 }">
+    <van-pull-refresh v-model="isLoading" @refresh="onRefresh">
+      <van-list
+        v-model="loading"
+        :finished="finished"
+        finished-text="没有更多了"
+        @load="getMore"
+      >
+        <van-search
+          v-model="batchCode"
+          show-action
+          placeholder="请输入批次号或开票编号"
+        >
+          <template #action>
+            <div @click="onSearch">搜索</div>
+          </template>
+        </van-search>
+        <van-checkbox-group v-model="checkList">
+          <div class="itemWrap" v-for="(item,index) in notifyList" :key="index" @click="toggle(index)">
+            <div class="item line1">
+              <div class="itemTime">
+                <span class="title">批次号:</span>
+                <span class="content">{{ item.batchCode }}</span>
+              </div>
+              <div class="orderNum">
+                <span class="title">总案件数:</span>
+                <span class="content">{{ item?.orderNum || '' }}</span>
+              </div>
+              <div class="checkBtn" @click="goPage('invoicingDetail',{id:item.id, batchCode: item.batchCode})">查看</div>
+            </div>
+            <div class="item">
+              <span class="title">开票月份:</span>
+              <span class="content">{{ getMonth(item) }}</span>
+            </div>
+            <div class="item">
+              <span class="title">结算总金额:</span>
+              <span class="content">{{ item?.totalMoney ? item.totalMoney : 0 }}元</span>
+            </div>
+            <div class="item">
+              <span class="title">扣款金额:</span>
+              <span class="content">{{ item?.cutMoney || 0 }}元</span>
+            </div>
+            <div class="item">
+              <span class="title">扣款原因:</span>
+              <span class="content" style="color: #FF8F37;">{{ item.remark }}</span>
+            </div>
+            <div class="item">
+              <span class="title">最终开票金额:</span>
+              <span class="content">{{ item?.invoiceMoney || 0 }}元</span>
+            </div>
+            <van-checkbox class="checkbox_cls" v-if="active == 2" :name="item" ref="checkboxes" />
+          </div>
+        </van-checkbox-group>
+      </van-list>
+    </van-pull-refresh>
+  </div>
+  <div class="invoice_btn_wrap" v-if="active == 2 && totalCount > 0">
+    <div class="invoice_btn_info">
+      <span class="invoice_btn_title">开票总金额</span>
+      <span class="invoice_btn_money">￥{{totalCount}}</span>
    </div>
-  </van-pull-refresh>
+    <div class="btn" @click="goUploadPage">去开票</div>
+  </div>
  <div v-show="show" class="bgShow">
    <img src="@/assets/empty.png">
  </div>
@ -53,6 +86,7 @@
 </template>

 <script>
+import { Decimal } from 'decimal.js';
 import {myMixins} from "@/utils/myMixins"
 import {notifyInvoiceList} from  "@/api/mine"
 export default {
@ -63,14 +97,89 @@ export default {
      notifyList:[],
      pageNum:1,
      pageSize:10,
+      total: 0,
      show:false,
      isLoading: false,
+      loading: false,
+      active: 1,
+      status: '',
+      dispatchAppSearchInvoiced: '',
+      batchCode: '',
+      finished: false,
+      checkList: [],
+      supplierId: '',
    }
  },
+  computed: {
+   /* totalCount () {
+      let total = 0;
+      this.checkList.map(item => {
+        total += item.invoiceMoney
+      })
+      return total
+    },*/
+    totalCount() {
+      // 使用 Decimal 来计算总金额
+      let total = new Decimal(0);
+
+      this.checkList.forEach(item => {
+        total = total.plus(new Decimal(item.invoiceMoney));
+      });
+
+      // 返回总金额，保留两位小数
+      return total.toNumber()
+    },
+  },
  mounted() {
-      this.getNotifyList()
+    this.supplierId = this.$route.query?.supplierId;
  },
  methods:{
+    goUploadPage() {
+      localStorage.setItem('list', JSON.stringify(this.checkList));
+      this.goPage('uploadInvoice', { supplierId : this.supplierId })
+    },
+    async onSearch() {
+      this.pageNum=1
+      await this.getNotifyList()
+    },
+    async getMore(){
+      if ( this.active != 2 ) {
+        await this.getNotifyList()
+        this.pageNum++;
+        // 加载状态结束
+        this.loading = false;
+        // 数据全部加载完成
+        if (this.notifyList.length >= this.total) {
+          this.finished = true;
+        }
+      }
+    },
+    changeTabHandler() {
+      this.pageNum = 1;
+      this.notifyList = [];
+      this.checkList = [];
+      if (this.active == 1) {   // 全部， 需要分页
+        this.status = '';
+        this.dispatchAppSearchInvoiced = '';
+        this.pageSize = 10;
+      } else if(this.active == 2) {   // 未开票, 不需要分页
+        this.status = 2;
+        this.dispatchAppSearchInvoiced = '';
+        this.pageSize = 10000
+      } else if(this.active == 3) {   // 已开票，需要分页
+        this.status = '';
+        this.dispatchAppSearchInvoiced = 1;
+        this.pageSize = 10
+      }
+      this.getNotifyList()
+    },
+    getMonth(item) {
+      let str = '';
+      let startTime = new Date(item.createTime);
+      let endTime = new Date(item.overTime);
+      str = startTime.getFullYear() + '年' + (startTime.getMonth() + 1 ) + '月 - ' + endTime.getFullYear() + '年' + (endTime.getMonth() + 1) + '月'
+      return str
+    },
    onRefresh() {
      this.pageNum=1
      this.getNotifyList()
@ -81,19 +190,34 @@ export default {
    },
    async getNotifyList(){
      let res =  await notifyInvoiceList({
-          pageNum:this.pageNum,
-          pageSize:this.pageSize
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        status: this.status,
+        dispatchAppSearchInvoiced: this.dispatchAppSearchInvoiced,
+        total: this.total,
+        batchCode: this.batchCode,
+        supplierId: this.supplierId,
+        current: 1,
      })
-      // if(res.code === 0){
-        this.notifyList=res.data;
-        console.log(this.notifyList)
-        if(this.notifyList.length === 0){
-              this.show=true
+      if(res.code == 200){
+        this.total=res.total
+        if(this.pageNum == 1){
+          this.notifyList=res.data;
+        }else{
+          let preList = this.notifyList;
+          let arr = res.data;
+          this.notifyList = preList.concat(arr)
+        }
+        if (this.notifyList.length === 0) {
+          this.show=true
        }else{
          this.show=false
        }
      }
-    // },
+    },
+    toggle(index) {
+      this.$refs.checkboxes[index].toggle();
+    },
  }
 }
 </script>
@ -101,6 +225,11 @@ export default {
 <style scoped lang="scss">
@import "@/styles/mixin.scss";
@import "@/styles/common.scss";
+.van-checkbox {
+  position: absolute;
+  bottom: 20px;
+  right: 15px;
+}
 .wrap{
  @include wh(100%,100%);
  background-color: #F4F5F7;
@ -113,6 +242,7 @@ export default {
 }
 .itemWrap{
  background: #FFFFFF;
+  position: relative;
  @include wh(100%,194px);
  box-sizing: border-box;
  padding: 14px 25px 18px 29px;
@ -125,6 +255,7 @@ export default {
    }
    .title{
      opacity: .5;
+      margin-right: 5px;
    }
  }
  .line1{
@ -141,10 +272,52 @@ export default {
 }
 .bgShow{
  @include flexTwoCenter;
-  height:calc(100% - 46px);
+  /*height:calc(100% - 46px);*/
  background-color: #FAFAFA;
  img{
    width: 100%;
  }
 }
-</style>
+.van-tabs {
+  position: fixed;
+  width: 100%;
+  background-color: #2c395f;
+  z-index: 1000000 !important;
+}
+  .content_wrap {
+    padding-top: 1.17333rem;
+  }
+  .invoice_btn_wrap {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    padding: 20px;
+    box-sizing: border-box;
+    background-color: #fff;
+    .invoice_btn_info {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .invoice_btn_title {
+        font-size: 14px;
+        font-weight: bold;
+      }
+      .invoice_btn_money {
+        font-size: 26px;
+        color: red;
+      }
+    }
+    .btn {
+      width: 100%;
+      background-color: #2C395F;
+      color: #fff;
+      padding: 15px 0;
+      text-align: center;
+      border-radius: 6px;
+    }
+  }
+
+  .pd_cls {
+    padding-bottom: 40px;
+  }
+</style>
--- a/src/views/index/notificationList.vue
+++ b/src/views/index/notificationList.vue
@ -0,0 +1,161 @@
+<template>
+  <div>
+    <div class="dialog-wrapper">
+      <div class="title">
+        {{ '告知函('+(currentIndex + 1)+'/'+ list.length+')' }}
+      </div>
+      <h3 class="top">{{currentItem?.title?currentItem?.title:(currentItem?.type==1 ? '质量不合格整改' : '质量不合格调整告知')}}</h3>
+      <div class="center">
+        <div v-html="formattedContent(currentItem)"></div>
+      </div>
+      <div class="end">
+        <div>中道汽车救援股份有限公司</div>
+        <div>区域管理部</div>
+        <div>{{formatDate(currentItem)}}</div>
+      </div>
+      <div class="iptWrap">
+        <div class="tip">请仔细阅读告知函内容，并在下方输入"我已阅读”以表明您已充分理解函件中的各项信息。</div>
+        <el-input style="width: 50%" v-model.trim="content" placeholder="请输入我已阅读"></el-input>
+      </div>
+      <div class="dialog-footer">
+        <el-button type="info" size="small" v-if="num > 0">还需阅读{{num}}秒</el-button>
+        <el-button type="primary" size="small"  v-if="num==0" @click="confirmHandle(currentItem)">确认</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {myMixins} from "@/utils/myMixins"
+  import {selectUnReadNotifyBySupplier, correctionHandle} from "@/api/order"
+  export default {
+    name: "notificationList",
+    mixins: [myMixins],
+    data() {
+      return {
+        list: [],
+        currentIndex: 0,
+        num:10,
+        timer: null,
+        content: '',
+      }
+    },
+    computed: {
+      currentItem() {
+        return this.list[this.currentIndex];
+      }
+    },
+    watch: {
+      currentIndex() {
+        this.content = '';
+        this.num = 10;
+        this.startCountdown();
+      },
+    },
+    async mounted() {
+      await this.getLetterList();
+      this.timer && clearInterval(this.timer)
+      this.startCountdown();
+    },
+    methods: {
+      async confirmHandle(item){
+        if (this.content === '我已阅读') {
+          console.log('item', item)
+          let res = await correctionHandle({
+            handleType:4,
+            operationType:'modify',
+            recordId:item.recordId,
+            planId:item.planId,
+            notifyId:item.id,
+          });
+          console.log('阅读res', res)
+          // 确认成功后处理下一个告知函
+          this.currentIndex++;
+          if (this.currentIndex < this.list.length) {
+            this.content = '';
+            this.num = 10;
+            this.startCountdown();
+          } else {
+            this.closeHandle();
+          }
+        } else {
+          this.$message.error('请输入"我已阅读"以确认');
+        }
+      },
+      async getLetterList(){
+        let res = await selectUnReadNotifyBySupplier();
+        let result = res?.data || []
+        if(result && result.length>0){
+          this.list = result
+        }
+      },
+      formatDate(val){
+        /** 日期格式化
+         * */
+        if(!val?.updateTime){
+          return
+        }
+        const date = new Date(val.updateTime);
+        const year = date.getFullYear();
+        const month = date.getMonth() + 1; // 月份从 0 开始，需要加 1
+        const day = date.getDate();
+        const formattedDate = `${year}年${month}月${day}日`;
+        return formattedDate
+      },
+      formattedContent(val) {
+        /** 转换文本，能被 v-html 识别
+         * */
+        return val?.content?.replace(/\r\n/g, '<br>').replace(/\n/g, '<br>');
+      },
+      startCountdown() {
+        this.stopCountdown()
+        this.timer = setInterval(() => {
+          if (this.num > 0) {
+            this.num--;
+          }
+        }, 1000);
+      },
+      closeHandle() {
+        this.stopCountdown();
+        // 调用 app 的方法
+        this.goBack();
+      },
+      stopCountdown() {
+        if (this.timer) {
+          clearInterval(this.timer);
+          this.timer = null;
+        }
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+.dialog-wrapper {
+  padding: 10px 20px;
+}
+.title {
+
+}
+  .top {
+    text-align: center;
+  }
+  .center {
+    margin: 20px 0;
+    line-height: 24px;
+    .hight{
+      color: #0B99E4;
+    }
+  }
+.end{
+  text-align: right;
+  line-height: 24px;
+}
+.tip{
+  margin-top: 40px;
+  margin-bottom: 10px;
+}
+  .dialog-footer {
+    text-align: right;
+  }
+</style>
--- a/src/views/index/showInvoice.vue
+++ b/src/views/index/showInvoice.vue
@ -0,0 +1,144 @@
+<template>
+  <div class="wrap">
+    <div class="navBar">
+      <van-nav-bar
+        title="查看发票"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="h5GoBack"
+      />
+    </div>
+    <div class="contentWrap">
+      <div class="content_tab">
+        <div class="tab_content">
+          <div class="item_wrap">
+            <div class="item_label">付款方</div>
+            <div class="item_content">中道汽车救援股份有限公司</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">收款方</div>
+            <div class="item_content">{{invoiceInfo.accountName}}</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">发票号码</div>
+            <div class="item_content">
+              {{invoiceInfo.invoiceNumber}}
+            </div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">发票金额</div>
+            <div class="item_content">￥{{invoiceInfo.invoiceMoney}}</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">税率</div>
+            <div class="item_content">{{invoiceInfo.taxRate}}%</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">税额</div>
+            <div class="item_content">{{invoiceInfo.taxAmount}}</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">未税金额</div>
+            <div class="item_content">{{invoiceInfo.afterTaxAmount}}</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">发票类型</div>
+            <div class="item_content">{{invoiceInfo.invoiceTypeCodeString}}</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">开票日期</div>
+            <div class="item_content">{{invoiceInfo.invoiceDate}}</div>
+          </div>
+          <div class="item_wrap">
+            <div class="item_label">发票影像</div>
+            <div class="item_content">
+              <div class="invoice_btn" @click="showInvoiceHandler(invoiceInfo.path)">查看发票</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { myMixins } from "@/utils/myMixins"
+  export default {
+    name: "showInvoice",
+    mixins:[ myMixins ],
+    data() {
+      return {
+        invoiceInfo: {},
+      }
+    },
+    mounted() {
+      let invoiceDetail = localStorage.getItem('invoiceDetail')
+      this.invoiceInfo = invoiceDetail ? JSON.parse(invoiceDetail) : {};
+      console.log('this.invoiceInfo', this.invoiceInfo)
+    },
+    methods: {
+      showInvoiceHandler(path) {
+        window.open(path)
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .wrap{
+    @include wh(100%,100%);
+    background-color: #F4F5F7;
+  }
+  .navBar{
+    height: 46px;
+  }
+  .contentWrap{
+    .mt_cls {
+      margin-top: 10px;
+    }
+    .content_tab {
+      background-color: #fff;
+      width: 100%;
+      padding: 15px 15px;
+      .tab_title {
+        font-size: 14px;
+        font-weight: bold;
+        margin-bottom: 5px;
+      }
+      .tab_content {
+        .item_wrap {
+          display: flex;
+          align-items: center;
+          line-height: 30px;
+          font-size: 12px;
+          .item_label {
+            color: rgba(0,0,0,0.5);
+            margin-right: 5px;
+            width: 60px;
+          }
+          .item_content {
+            display: flex;
+            align-items: center;
+          }
+        }
+      }
+    }
+  }
+  .copyIcon {
+    width: 35px;
+    height: 15px;
+    margin-left: 10px
+  }
+  .invoice_btn {
+    padding: 0 15px;
+    background-color: #354D93;
+    border-radius: 4px;
+    height: 28px;
+    color: #fff;
+  }
+</style>
--- a/src/views/index/supplySettlement.vue
+++ b/src/views/index/supplySettlement.vue
@ -6,15 +6,15 @@
      <div class="metersWrap">
        <div class="item"  v-show="supplierSettlementType != 1">
          <div class="leftKiloMeters">AB段公里数</div>
-          <div class="rightInput"><input type="number" v-model="form.reportMileageAb"/>公里</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageAb"/>公里</div>
        </div>
        <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">BC段公里数</div>
-          <div class="rightInput"><input type="number" v-model="form.reportMileageBc"/>公里</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageBc"/>公里</div>
        </div>
        <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">CA段公里数</div>
-          <div class="rightInput"><input type="number" v-model="form.reportMileageCa"/>公里</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.reportMileageCa"/>公里</div>
        </div>
      </div>
    </div>
@ -24,15 +24,15 @@
      <div class="metersWrap">
        <div class="item"  v-show="supplierSettlementType != 1">
          <div class="leftKiloMeters">AB段路桥费</div>
-          <div class="rightInput"><input type="number" v-model="form.bridgeAmountAb"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountAb"/>元</div>
        </div>
        <div class="item"  v-show="supplierSettlementType == 1 || supplierSettlementType == 2 || supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">BC段路桥费</div>
-          <div class="rightInput"><input type="number" v-model="form.bridgeAmountBc"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountBc"/>元</div>
        </div>
        <div class="item"  v-show=" supplierSettlementType == 3 || supplierSettlementType == 4">
          <div class="leftKiloMeters">CA段路桥费</div>
-          <div class="rightInput"><input type="number" v-model="form.bridgeAmountCa"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.bridgeAmountCa"/>元</div>
        </div>
      </div>
    </div >
@ -42,23 +42,23 @@
      <div class="metersWrap">
        <div class="item"  >
          <div class="leftKiloMeters">小轮个数</div>
-          <div class="rightInput"><input type="number" v-model="form.tyreNumber" @input="handleInput"/>个</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.tyreNumber" @input="handleInput"/>个</div>
        </div>
        <div class="item">
          <div class="leftKiloMeters">等候费</div>
-          <div class="rightInput"><input type="number" v-model="form.waitAmount"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.waitAmount"/>元</div>
        </div>
        <div class="item"  >
          <div class="leftKiloMeters">困境费</div>
-          <div class="rightInput"><input type="number" v-model="form.dilemmaFee"/>元</div>
+          <div class="rightInput"><input type="number" :disabled="!taskCostShow" v-model="form.dilemmaFee"/>元</div>
        </div>
        <div class="item blueColor" >
          <div class="leftKiloMeters">收取客户金额</div>
-          <div class="rightInput blueColor"><input class="blueColor" type="number" v-model="form.customerAmount"/>元</div>
+          <div class="rightInput blueColor"><input class="blueColor" type="number" :disabled="!taskCostShow" v-model="form.customerAmount"/>元</div>
        </div>
      </div>
    </div>
-    <div class="btn">
+    <div class="btn" v-if="taskCostShow || finishLt7">
      <button @click="submit">提交</button>
    </div>
  </div>
@ -86,7 +86,9 @@ export default {
        waitAmount:'',
        dilemmaFee:'',
        customerAmount:'',
-        taskFlowId:''
+        taskFlowId:'',
+        auditStatus:'',
+        finishTime:'',
      }
    }
  },
@ -97,6 +99,14 @@ export default {
      this.orderCode = urlParams.get('orderCode')
      await this.getDetail()
  },
+  computed:{
+    taskCostShow() {
+      return this.form.auditStatus?.code && !([3, 4, 6].includes(this.form.auditStatus.code))
+    },
+    finishLt7(){
+      return  !this.form.finishTime || (this.form.finishTime && new Date().getTime() - new Date(this.form.finishTime).getTime() <= 7 * 24 * 60 * 60 * 1000)
+    },
+  },
  methods:{
    handleInput(event) {
      const newValue = parseInt(event.target.value, 10);
@ -118,7 +128,6 @@ export default {
      })
      leftCopy(this.form,{...res.data});
      this.supplierSettlementType= res.data.supplierSettlementType?.code
-      // this.form.taskFlowId =1
    },
    async updatSettlement(){
      let result =await updateOrderSettlement({
--- a/src/views/index/uploadInvoice.vue
+++ b/src/views/index/uploadInvoice.vue
@ -0,0 +1,599 @@
+<template>
+  <div class="wrap">
+    <div class="navBar">
+      <van-nav-bar
+        title="上传发票"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="h5GoBack"
+      />
+    </div>
+    <div class="contentWrap">
+      <div class="content_top">
+        <div class="content_tip">【注】如结算金额确认无误后，请开具正规增值税专用发票（开票项为：施救费、救授费、拖车费、帝引费任选其一）。如有路桥费产生，请开在救援发票中。</div>
+        <div class="top_detail">
+          <div class="detail_title detail_color">
+            <div class="title"> <span class="squire"></span> 应开金额</div>
+            <div class="money">￥{{ invoiceTotal }}</div>
+          </div>
+          <div class="border"></div>
+          <div class="detail_content" v-for="(item, index) in list" :key="index + '_1'">
+            <div class="content_item">
+              {{item.batchCode}}
+              <span class="content_money">￥{{item.invoiceMoney}}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="content_top mt10">
+        <div class="detail_title detail_color2 pd_no">
+          <div class="title"> <span class="squire squire2"></span> 实开金额</div>
+          <div class="money">￥{{ invoiceMoney || 0 }}</div>
+        </div>
+        <div class="border"></div>
+        <div class="invoice_wrap mt10" v-for="(item, index) in tableData" :key="index" @click="goInvoiceDetail(item)">
+          <div class="invoice_title">
+            <div>{{item.accountName}}</div>
+            <div class="btn_del" @click.stop="deleteHandler(item)">删除</div>
+          </div>
+          <div class="border"></div>
+          <div class="invoice_content">
+            <div>
+              <span class="label">发票号码:</span>
+              <span>{{item.invoiceNumber}}</span>
+            </div>
+            <div>
+              <span  class="label">发票金额:</span>
+              <span class="invoice_money">￥{{item.invoiceMoney}}</span>
+            </div>
+            <div class="invoice_flex">
+              <div>
+                <span  class="label">开票日期:</span>
+                <span>{{item.invoiceDate}}</span>
+              </div>
+              <van-icon class="icon" name="arrow" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="upload_btn_wrap">
+      <div class="btn_save" @click="createInvoiceHandler">保存</div>
+      <van-uploader :before-read="beforeRead" :after-read="afterRead" accept=".png,.jpg,.jpeg,.pdf,.ofd">
+        <div class="btn_upload">
+          <img class="icon_upload" src="@/assets/icon_upload.png" alt="">
+          上传发票
+        </div>
+      </van-uploader>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { Decimal } from 'decimal.js';
+  import { Dialog } from "vant";
+  import { myMixins } from "@/utils/myMixins"
+  import { uploadInvoice, getBillingInfo, deleteInvoice, createBatch } from "@/api/mine"
+  export default {
+    name: "uploadInvoice",
+    mixins:[ myMixins ],
+    data(){
+      return {
+        list: [],
+        invoiceMoneyTotal: 0,
+        tableData: [],
+        activeObj: {},
+        billInfo: {},
+        supplierId: '',
+        queryId: '',
+        batchIds: [],
+        shouldRate: '',
+        realRate: '',
+        invoiceType: '',
+        invoiceMoney: 0,
+        afterTaxAmount: 0,
+        form: {
+          courierNumber: '',
+          invoiceType: '', //电子发票还是纸质发票
+        },
+        show: true,
+      }
+    },
+    async mounted() {
+      await this.initData();
+    },
+    async activated() {
+      await this.initData();
+      this.show = true;
+    },
+    watch: {
+      tableData: {
+        immediate: true,
+        handler() {
+          this.getInvoiceMoney()
+        }
+      }
+    },
+    computed: {
+      invoiceTotal () {
+        let total = 0;
+        this.list?.map(item => {
+          total = new Decimal(total).plus(new Decimal(item.invoiceMoney)).toNumber()
+        })
+        return total
+      }
+    },
+    deactivated() {
+      if (this.show) {
+        this.tableData = [];
+      }
+    },
+    methods: {
+      async initData() {
+        this.list = JSON.parse(localStorage.getItem('list'));
+        this.batchIds = [];
+        this.list.map(a => {
+          this.batchIds.push(a.id)
+        })
+        console.log('this.batchIds', this.batchIds)
+        this.shouldRate = this.list[0]?.shouldRate
+        this.realRate = this.list[0]?.realRate
+        this.invoiceType = this.list[0]?.invoiceType
+        this.supplierId = this.list[0]?.supplierId
+        await this.getInfo();
+      },
+      async getInfo() {
+        if(this.supplierId) {
+          let res = await getBillingInfo('/supplier/info/billing/getBySupplierId/' + this.supplierId )
+          this.billInfo = res.data || {}
+        }
+      },
+      async createInvoiceHandler() {
+        if ( !this.form.invoiceType ) {
+          this.$toast('发票类型不能为空！')
+          return
+        }
+        if (this.invoiceTotal != this.invoiceMoney) {
+          this.$toast('“应开金额”与“实开金额”不一致，请核实系统的开票金额与实际开出的发票金额。')
+          return
+        }
+        if(this.form.invoiceType == 2){
+          Dialog.confirm({
+            title: '提示',
+            message: '纸质发票上传后请尽快邮寄，并在系统《开票信息》菜单，录入快递单号，以免影响结算时效！谢谢！',
+          }).then(async () => {
+            await this.saveHandle();
+          }).catch(() => {
+          });
+        } else {
+          await this.saveHandle();
+        }
+      },
+      async saveHandle() {
+        let paramsArr = this.getParams();
+        console.log('.......', paramsArr)
+        try {
+          this.loading = true;
+          let res = await createBatch({
+            supplierId: this.supplierId,
+            batchIds: this.batchIds,
+            detailList: paramsArr
+          })
+          console.log('res', res)
+          this.loading = false;
+          Dialog.alert({
+            title: '提示',
+            message: `发票已上传成功，待审核。开票编号为：${res.data}，请前往菜单【开票信息】中查看。`,
+          }).then(() => {
+           this.h5GoBack()
+          });
+        } catch (e) {
+          console.log('eee', e)
+          Dialog.alert({
+            title: '提示',
+            message: e + '发票提交出错',
+          }).then(() => {
+
+          });
+        }finally {
+          this.loading = false;
+        }
+      },
+      getParams() {
+        let params = [...this.tableData]
+        if(params.length > 0) {
+          params.map(item => {
+            item.courierNumber = (this.form.invoiceType == 2 ? this.form.courierNumber : '')
+            item.invoiceType = this.form.invoiceType
+            if( item.taxRate.toString().indexOf('%') != -1 ) {
+              let tempRate = item.taxRate.replace('%', '');
+              item.taxRate = (Number(tempRate) / 100)
+            }
+          })
+        }
+        return params
+      },
+      deleteHandler( row ) {    // 删除发票
+        Dialog.confirm({
+          title: '提示',
+          message: '确认要删除发票信息吗?',
+        }).then(async () => {
+          await deleteInvoice({
+            id: row?.id || '',
+            path: row?.path
+          });
+          let index = this.tableData.findIndex(a => a.invoiceNumber == row.invoiceNumber)
+          this.tableData.splice(index, 1)
+        }).catch(() => {
+        });
+      },
+      beforeRead (file) {
+        const FileExt = file.name.replace(/.+\./, "");
+        if (['jpg', 'png', 'jpeg', 'pdf', 'ofd'].indexOf(FileExt.toLowerCase()) === -1) {
+          this.$toast('请上传后缀名为jpg、jpeg、png、pdf、ofd的文件！')
+          return false;
+        }
+        this.$set(this.activeObj, 'fileType', FileExt)
+        return  true
+      },
+      async afterRead (file) {
+        try {
+          var formData = new FormData();  // 创建form对象
+          formData.append('file', file.file);  // 通过append向form对象添加数据
+          formData.append('supplierId', this.supplierId)  // 如果还需要传替他参数的话
+          let res = await uploadInvoice(formData)
+          console.log('rrerer', res)
+          if( res?.code == 200 ) {
+            let test =  this.tableData.filter(item => item.invoiceNumber == res.data.ocrInvoiceRes.data.invoiceNumber)  // 如果
+            if(  test.length > 0 ) {      // 发票是否已经上传过
+              this.$message.warning("该发票已上传，不能重复上传")
+              return false
+            } else {
+
+              let invoiceDetails = this.getInvoiceRates(res.data.ocrInvoiceRes.data.invoiceDetails)
+              let flag = this.legalRate(invoiceDetails)
+              let realFlag = this.realRateCheck(invoiceDetails)
+              let errorStr = "";
+              //电子发票，验证必须是pdf版本
+              if((res.data.ocrInvoiceRes.data.invoiceType.indexOf("数电") != -1 || res.data.ocrInvoiceRes.data.invoiceType.indexOf("电子") != -1) && this.activeObj.fileType != 'pdf'){
+                errorStr = errorStr + "电票请上传PDF格式的文件;"
+              }
+              if(res.data.ocrInvoiceRes.data.invoiceType.indexOf("专用发票") == -1 && this.invoiceType == 1){
+                errorStr = errorStr + "上传发票类型与服务商配置发票类型不一致，设置类型为：专票;";
+              }
+              if(!this.billInfo.unitName ){
+                errorStr = errorStr + "未设置抬头，请联系区域经理;";
+              }
+              if(!this.billInfo.dutyParagraph ){
+                errorStr = errorStr + "未设置纳税人识别号，请联系区域经理;";
+              }
+              let ocrName = res.data.ocrInvoiceRes.data.sellerName.replace('(','').replace('（','').replace(')','').replace('）','');
+              let billName = ''
+              if (this.billInfo && this.billInfo.unitName) {
+                billName = this.billInfo.unitName.replace('(','').replace('（','').replace(')','').replace('）','');
+              }
+              let diffNumber = this.charDifference(ocrName,billName);
+              if(ocrName != billName && diffNumber > 2 && !res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局")){
+                errorStr = errorStr + "上传发票抬头与服务商配置不一致，设置抬头为：" + (this.billInfo.unitName || '未设置') + "，识别抬头为：" + res.data.ocrInvoiceRes.data.sellerName + ";如发票确认无误，请联系结算部：021-53682525";
+              }
+              let conList = res.data.ocrInvoiceRes.data.invoiceDetails.filter(a => a.itemName.includes("*"))
+              if(!res.data.ocrInvoiceRes.data.sellerName.startsWith("国家税务总局") &&
+                conList.every(a => {
+                  let items = a.itemName.split("*")
+                  return (!items[1].includes("现代服务") && !items[1].includes("运输服务")) || (!items[2].includes("拖车") && !items[2].includes("救援") && !items[2].includes("施救") && !items[2].includes("清障") && !items[2].includes("道路救援"))
+                })
+              ){
+                errorStr = errorStr + "分类必须包含：现代服务/运输服务，服务名称必须包含：拖车/救援/施救/清障/道路救援 ;例如《*现代服务*拖车费》";
+              }
+
+              if( !flag ) {
+                Dialog.alert({
+                  title: '提示',
+                  message: '您上传的发票税率不符合要求',
+                }).then(() => {
+                  this.uploadLoading=false;
+                  return false
+                });
+              }else if(!realFlag){
+                Dialog.alert({
+                  title: '提示',
+                  message: "您上传的发票税率与服务商配置税率不一致，设置税率为：" + this.realRate + "%"
+                }).then(() => {
+                  this.uploadLoading=false;
+                  return false
+                });
+              }else if(errorStr && errorStr.length > 0){
+                Dialog.alert({
+                  title: '提示',
+                  message: errorStr,
+                }).then(() => {
+                  this.uploadLoading=false;
+                  return false
+                });
+              } else {
+                console.log('res', res)
+                console.log('file', file)
+                this.form.invoiceType = res.data.ocrInvoiceRes.data.invoiceType.indexOf("数电") == -1 && res.data.ocrInvoiceRes.data.invoiceType.indexOf("电子") == -1 ? 2 : 1
+                let isOrdinaryInvoice = res.data.ocrInvoiceRes.data.invoiceType.indexOf("普通") > -1
+                this.$set(this.activeObj, 'imageUrl', '')
+                this.$set(this.activeObj, 'fileName', '')
+                if (['pdf','ofd'].indexOf(this.activeObj.fileType) === -1) {
+                  // this.activeObj.imageUrl = URL.createObjectURL(file.raw);
+                  this.activeObj.imageUrl = res.data.url
+                  this.$set(this.activeObj, 'fileName', file.file.name)
+                } else {
+                  this.$set(this.activeObj, 'fileName', file.file.name)
+                }
+                this.$set(this.activeObj, 'path', res.data.url)
+                this.$set(this.activeObj, 'invoiceNumber', res.data.ocrInvoiceRes.data.invoiceNumber)
+                this.$set(this.activeObj, 'accountName', res.data.ocrInvoiceRes.data.sellerName)
+                this.$set(this.activeObj, 'invoiceMoney', res.data.ocrInvoiceRes.data.totalAmount)
+                this.$set(this.activeObj, 'taxRate',isOrdinaryInvoice?0: res.data.ocrInvoiceRes.data.invoiceDetails[0].taxRate)
+                this.$set(this.activeObj, 'taxAmount',isOrdinaryInvoice?0: res.data.ocrInvoiceRes.data.invoiceTax)
+                this.$set(this.activeObj, 'afterTaxAmount',isOrdinaryInvoice?res.data.ocrInvoiceRes.data.totalAmount: res.data.ocrInvoiceRes.data.invoiceAmountPreTax)
+                this.$set(this.activeObj, 'invoiceDate', res.data.ocrInvoiceRes.data.invoiceDate)
+                this.$set(this.activeObj, 'invoiceCode', res.data.ocrInvoiceRes.data.invoiceCode)
+                this.$set(this.activeObj, 'invoiceTypeCodeString', res.data.ocrInvoiceRes.data.invoiceType)
+                this.$set(this.activeObj, 'payName', res.data.ocrInvoiceRes.data.purchaserName)
+                this.tableData.push({...this.activeObj})
+                this.$forceUpdate()
+              }
+            }
+          }
+        } catch (e) {
+          console.log('eeee', e)
+        }
+      },
+      goInvoiceDetail (item) {
+        localStorage.setItem('invoiceDetail', JSON.stringify(item))
+        this.show = false;
+        this.goPage('showInvoice')
+      },
+      getInvoiceMoney() {
+        let invoiceMoney = 0;
+        let afterTaxAmount = 0;
+        if( this.tableData.length > 0){
+          this.tableData.map(item => {
+            if( item.invoiceMoney && item.afterTaxAmount ) {
+              invoiceMoney += (Number(item.invoiceMoney) * 100)
+              afterTaxAmount += ( Number(item.afterTaxAmount) * 100 )
+            }
+          })
+          this.invoiceMoney = invoiceMoney != 0 ?  (invoiceMoney / 100) : 0
+          this.afterTaxAmount = afterTaxAmount != 0 ? ( afterTaxAmount / 100 ) : 0
+        } else {
+          this.invoiceMoney = invoiceMoney
+          this.afterTaxAmount = afterTaxAmount
+        }
+      },
+      charDifference(str1,str2) {
+        let difference = 0;
+        // 遍历字符串1的每个字符
+        for (let i = 0; i < str1.length; i++) {
+          // 如果字符串2中不包含当前字符，或者位置不对，则误差加1
+          if (str2.indexOf(str1[i]) === -1 || str2[i] !== str1[i]) {
+            difference++;
+          }
+        }
+
+        //如果前面部分都对得上，但是长度不同，则差异是长度
+        if(str1.length != str2.length){
+          difference += Math.abs(str1.length - str2.length)
+        }
+        // 同样遍历字符串2，处理字符串1中不存在的字符
+        /*for (let i = 0; i < str2.length; i++) {
+          if (str1.indexOf(str2[i]) === -1) {
+            difference++;
+          }
+        }*/
+        return difference;
+      },
+      legalRate(rateList) {     // 合法的 税率
+        let rate = rateList[0]
+        let flag = rateList.every(item => {
+          //设置的是普票，不校验税率
+          if(this.invoiceType == 2 && item != '免税' && item != '0%'){
+            return true
+          }
+          return  item == rate && ['1%', '3%', '6%', '9%', '13%'].includes(item)
+        })
+        console.log('flag', flag)
+        return flag
+      },
+      realRateCheck(rateList) {     // 和设置的税率是否符合
+        let rate = rateList[0]
+        let flag = rateList.every(item => {
+          //设置的是普票，不校验税率
+          if(this.invoiceType == 2 && item != '免税' && item != '0%'){
+            return true
+          }
+          return  item == rate && this.realRate + '%' == item
+        })
+        console.log('flag', flag)
+        return flag
+      },
+      getInvoiceRates(invoiceDetails) {     // 获取发票详情的税率数组
+        let rates = [];
+        invoiceDetails.map(item => {
+          rates.push(item.taxRate)
+        })
+        return rates
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  @import "@/styles/mixin.scss";
+  @import "@/styles/common.scss";
+  .wrap{
+    @include wh(100%,100%);
+    background-color: #F4F5F7;
+    overflow-y: auto;
+  }
+  .navBar{
+    height: 46px;
+  }
+  .mt10 {
+    margin-top: 10px;
+  }
+  .contentWrap {
+    padding-bottom: 70px;
+    .content_top {
+      padding: 15px 20px;
+      background-color: #fff;
+      .content_tip {
+        font-size: 12px;
+        color: rgba(0, 0, 0, 0.5);
+      }
+      .top_detail {
+        .detail_content {
+          display: flex;
+          flex-wrap: wrap;
+          justify-content: space-between;
+          padding: 10px 0;
+          .content_item {
+            font-size: 12px;
+            color: rgba(0, 0, 0, 0.5);
+            line-height: 27px;
+            .content_money {
+              font-size: 15px;
+              color: #D48139;
+              font-weight: bold;
+            }
+          }
+        }
+      }
+      .detail_title {
+        font-weight: bold;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        font-size: 16px;
+        padding: 10px 0;
+      }
+      .title {
+        display: flex;
+        align-items: center;
+      }
+      .money {
+        font-size: 22px;
+      }
+      .detail_color {
+        color: #D48139;
+      }
+      .detail_color2 {
+        color: #FF5D2E;
+      }
+      .pd_no {
+        padding-top: 0;
+      }
+    }
+  }
+  .squire {
+    width: 6px;
+    height: 6px;
+    display: inline-block;
+    background-color: #D48139;
+    border-radius: 2px;
+    margin-right: 10px;
+  }
+  .squire2 {
+    background-color: #FF5D2E;
+  }
+  .border {
+    width: 100%;
+    height: 0;
+    border-bottom: 1px solid;
+    opacity: 0.16;
+    border-image: linear-gradient(270deg, rgba(217, 217, 217, 0.6), rgba(178, 178, 178, 1), rgba(178, 178, 178, 1), rgba(217, 217, 217, 0.6)) 1 1;
+  }
+
+  .invoice_wrap {
+    background-color: #F4FAFF;
+    padding: 11px 3px 15px 18px;
+    border-radius: 4px;
+    border: 1px solid #EBF2F7;
+    .invoice_title {
+      font-size: 14px;
+      font-weight: bold;
+      color: rgba(50, 54, 67, 0.76);
+      display: flex;
+      justify-content: space-between;
+      margin-bottom: 10px;
+      .btn_del {
+        width: 48px;
+        height: 18px;
+        margin-right: 12px;
+        line-height: 18px;
+        text-align: center;
+        border-radius: 3px;
+        border: 1px solid #DDDDDD;
+        font-size: 12px;
+        color: rgba(0, 0, 0, 0.7);
+        font-weight: normal;
+      }
+    }
+    .invoice_content {
+      padding-top: 10px;
+      padding-right: 12px;
+      color: #000;
+      font-size: 12px;
+      line-height: 24px;
+      .label {
+        font-size: 12px;
+        color: rgba(0, 0, 0, 0.5);
+        margin-right: 10px;
+      }
+      .invoice_money {
+        color: #FF5D2E;
+        font-size: 15px;
+        font-weight: bold;
+      }
+    }
+  }
+  .upload_btn_wrap {
+    position: fixed;
+    width: 100%;
+    box-sizing: border-box;
+    bottom: 0;
+    left: 0;
+    padding: 15px 30px;
+    display: flex;
+    color: #fff;
+    font-weight: bold;
+    font-size: 14px;
+    line-height: 40px;
+    background: #FBFBFB;
+    box-shadow: 0px -1px 20px 4px rgba(98,107,128,0.2);
+    div {
+      height: 40px;
+      border-radius: 5px;
+      text-align: center;
+      flex: 1;
+    }
+    .btn_save {
+      background: #354D93;
+      margin-right: 4px;
+    }
+    .btn_upload {
+      background: #354D93;
+      margin-left: 4px;
+    }
+    .icon_upload {
+      width: 13px;
+      height: 13px;
+    }
+  }
+  .invoice_flex {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
+  ::v-deep .van-uploader__input-wrapper {
+    width: 100% !important;
+  }
+</style>
--- a/src/views/index/vehicleAdd.vue
+++ b/src/views/index/vehicleAdd.vue
@ -40,6 +40,20 @@
      accept="image "
    />
  </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <img class="startImg" src="@/assets/start.png" />
+      <span>行驶证车辆照片页</span>
+    </div>
+    <van-uploader
+      v-model="vehicleLicenseCarPhotoList"
+      :after-read="vehicleLicenseCarHandler"
+      :max-size="5 * 1024 * 1024"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
+    />
+  </div>
  <div class="itemContent">
    <div class="titleType">
      <img class="startImg" src="@/assets/start.png" />
@ -60,9 +74,64 @@
      <img class="startImg" src="@/assets/start.png" />
      <span>车辆类型</span>
    </div>
-    <select id="mySelect"  class="mySelect"  v-model="selectedOption">
-      <option v-for="(item,index) in typeList" :key="index" :value="index">{{item}}</option>
+<!--
+    <select
+        id="mySelect"
+        class="mySelect"
+        v-model="selectedOption"
+        multiple
+    >
+      <option
+          v-for="item in typeList"
+          :key="item"
+          :value="item"
+          :disabled="isOptionDisabled(item)"
+      >
+        {{ item }}
+      </option>
    </select>
+-->
+    <el-select
+        multiple
+        :multiple-limit="isMultiple ? 2 : 1"
+        v-model="selectedOption"
+        value-key="name"
+        class="elSelect"
+        collapse-tags="collapse-tags"
+        placeholder="请选择"  style="width: 55%"
+    >
+      <el-option
+          v-for="item in vehicleTypes"
+          :key="item.name"
+          :label="item.name"
+          :value="item.value"
+          :disabled="!item.disabled ? false : true"
+      >
+      </el-option>
+    </el-select>
+
+  </div>
+  <div class="itemContent">
+    <div class="titleType">
+      <span>牌照</span>
+    </div>
+    <el-select
+      v-model="vehicleLicense"
+      disabled
+      value-key="name"
+      class="elSelect"
+      collapse-tags="collapse-tags"
+      placeholder="请选择"  style="width: 55%"
+    >
+      <el-option
+        v-for="item in vehicleLicenseOptions"
+        :key="item.name"
+        :label="item.name"
+        :value="item.value"
+      >
+      </el-option>
+    </el-select>
+
  </div>
  <div class="lineBot"></div>
  <div class="itemContent">
@ -107,7 +176,7 @@
        <span class="line"></span>
      </div>
      <div :ref="'checkboxGroup' + index"  class="checkbox-group">
-        <van-checkbox-group  v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap" >
+        <van-checkbox-group  v-model="serviceIds" v-for="(item2,index2) in item.children" :key="index2" class="radioWrap">
          <van-checkbox class="item" :name="item2.id">{{item2.name }}</van-checkbox>
        </van-checkbox-group>
      </div>
@ -138,35 +207,133 @@ export default {
      checked: true,
      carNum:"",//车牌号
      typeList:[],//车辆类型列表
-      selectedOption:'1',//车辆类型
+      selectedOption:[],//车辆类型
      id:'',//车辆Id
      serviceIds:[],//车辆服务种类,
      supplierServiceList:[],
+      oldSupplierServiceList:[],
      show:false,
      imageUrl: require('@/assets/arr_right.png'),
      vehicleLicenseFrontList: [],
      vehicleLicenseBackList: [],
+      vehicleLicenseCarPhotoList: [],
      vehicleFrontPhotoList: [],
      vehicleLicenseFront: '',  // 行驶证首页
      vehicleLicenseBack: '',   // 行驶证副页
+      vehicleLicenseCarPhoto: '',  // 行驶证车辆照片
      vehicleFrontPhoto: '',    // 车头照
      vehicleLicenseInfo: {},
      vehicleLicenseBackOcrFlag: false,   // 行驶证副页 修改时默认不需要 ocr识别
+      isMultiple: false,     // 是否支持多选
+      vehicleLicense:'',//牌照
+      vehicleFrontLicensePlate:'',//车头照车牌号码
+      vehicleTypes:[{
+        name: '小修车',
+        value: 1
+      },{
+        name: '一般平板车',
+        value: 2
+      },{
+        name: '落地平板车',
+        value: 3
+      },{
+        name: '地库车',
+        value: 4
+      },
+        {
+          name:'牵引车',
+          value: 5 },
+        {
+          name:'大力神',
+          value:6},
+        {
+          name:'充电车',
+          value: 7 },
+        {
+          name:'吊车',
+          value: 8 },
+        {
+          name:'公车',
+          value: 9 },
+        {
+          name:'箱式拖车',
+          value: 10 },
+
+      ],
+      vehicleLicenseOptions: [{
+        name: '蓝牌',
+        value: 1
+      }, {
+        name: '黄牌',
+        value: 2
+      }, {
+        name: '新能源',
+        value: 3
+      }, {
+        name: '临牌',
+        value: 4
+      }, {
+        name: '其他',
+        value: 5
+      }]
    }
  },
+  watch:{
+    selectedOption(newVal){
+      if(newVal == 4){
+        this.isMultiple = true
+        this.vehicleTypes[2].disabled=true
+        this.vehicleTypes[5].disabled=true
+        this.vehicleTypes[6].disabled=true
+        this.vehicleTypes[7].disabled=true
+        this.vehicleTypes[8].disabled=true
+        this.vehicleTypes[9].disabled=true
+      }else{
+        this.isMultiple = false
+        this.vehicleTypes[2].disabled=false
+        this.vehicleTypes[5].disabled=false
+        this.vehicleTypes[6].disabled=false
+        this.vehicleTypes[7].disabled=false
+        this.vehicleTypes[8].disabled=false
+        this.vehicleTypes[9].disabled=false
+      }
+      if (newVal == 1 || newVal == 7){
+        let arr = []
+        this.supplierServiceList.forEach((item)=>{
+          if(!(item.name == '拖车服务' || item.name == '大型车救援')){
+            arr.push(item)
+          }
+        })
+        this.supplierServiceList = arr
+      }else{
+        this.supplierServiceList = this.oldSupplierServiceList
+      }
+
+    },
+  },
+
  async mounted() {
    this.id=this.$route.params?.id
-    const selectElement = document.getElementById('mySelect');
-    selectElement.addEventListener('change', function() {
-     this.selectedOption=selectElement.value;
-    });
+    await this.getSupplierServiceTree();
    await this.getTypeList();
    if( this.id){
      await this.vehicleInfo()
    }
-    await this.getSupplierServiceTree();
  },
  methods:{
+    getVehicleLicense(color) {
+      if( color == '蓝' ) {
+        this.vehicleLicense = 1
+      } else if(color == '黄') {
+        this.vehicleLicense = 2
+      } else if(color == '临牌') {
+        this.vehicleLicense = 4
+      } else if(color.includes('绿')) {
+        this.vehicleLicense = 3
+      } else {
+        this.vehicleLicense = 5
+      }
+    },
    async vehicleLicenseFrontHandler(file) {    // 上传 行驶证首页
      const formData = new FormData();
      formData.append("file" , file.file);
@ -182,11 +349,27 @@ export default {
      this.vehicleLicenseBack = res.data;
      await this.vehicleBackOcrHandler();
    },
+    async vehicleLicenseCarHandler(file) {     // 上传 行驶证车辆照片
+      const formData = new FormData();
+      formData.append("file" , file.file);
+      let res = await uploadImage(formData);
+      this.vehicleLicenseCarPhoto = res.data;
+    },
    async vehicleFrontPhotoHandler(file) {     // 上传 车头照
      const formData = new FormData();
      formData.append("file" , file.file);
      let res = await uploadImage(formData);
      this.vehicleFrontPhoto = res.data;
+      await this.ocrCarFrontHandler()
+    },
+    async ocrCarFrontHandler() {     // 车辆正面 orc 识别
+      let res = await ocrHandler({
+        ocrType: 10,
+        imageUrl: this.vehicleFrontPhoto,
+        cardSide: 'FRONT'
+      });
+      this.vehicleFrontLicensePlate=res.data?.number
+      this.getVehicleLicense(res.data.color)
    },
    async vehicleOcrHandler() {     // 行驶证首页 ocr 识别
      this.vehicleLicenseInfo.licensePlateNumber = '';
@ -265,31 +448,53 @@ export default {
    },
    async getTypeList() {
        let result=await vehicleTypeList();
+        this.typeList=[]
        if(result.code === 200){
-          this.typeList=result.data
+          for (const key in result.data){
+            // console.log("keys",result.data[key])
+            this.typeList.push({name:result.data[key],disabled:false,value:(key+1)})
+            // this.typeList.push(result.data[key])
+
+          }
        }
    },
    async getSupplierServiceTree(){
      let res = await supplierServiceTree();
      this.supplierServiceList=res.data
+      this.oldSupplierServiceList=this.supplierServiceList
    },
    async vehicleInfo(){
      let res= await  getInfoById({
        vehicleId:this.id
      })
      let result=res.data;
+      console.log("result",result)
      this.id=result.vehicleId
      this.carNum=result.plateNumber
      this.isJoin=result.hasPolymerization.code
-      this.selectedOption=result.vehicleType;
+      this.selectedOption=result.vehicleType?.split(',').map((item)=>{
+        return Number(item);
+      });
      this.serviceIds=result.serviceIds
      this.vehicleLicenseFront = result.vehicleLicenseFront;
      this.vehicleLicenseBack = result.vehicleLicenseBack;
      this.vehicleFrontPhoto = result.vehicleFrontPhoto;
      this.vehicleLicenseInfo = result.vehicleLicenseInfo;
-      this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
-      this.vehicleLicenseBackList = [{ url : this.vehicleLicenseBack }];
-      this.vehicleFrontPhotoList = [{ url : this.vehicleFrontPhoto }];
+      this.vehicleLicenseCarPhoto = result.vehicleLicenseCarPhoto;
+      this.vehicleLicense = result.vehicleLicense;
+      this.vehicleFrontLicensePlate = result.vehicleFrontLicensePlate;
+      if( this.vehicleLicenseFront ) {
+        this.vehicleLicenseFrontList = [{ url : this.vehicleLicenseFront }];
+      }
+      if(this.vehicleLicenseBack) {
+        this.vehicleLicenseBackList = [{ url : this.vehicleLicenseBack }];
+      }
+      if(this.vehicleFrontPhoto) {
+        this.vehicleFrontPhotoList = [{ url : this.vehicleFrontPhoto }];
+      }
+      if(this.vehicleLicenseCarPhoto) {
+        this.vehicleLicenseCarPhotoList = [{ url : this.vehicleLicenseCarPhoto }];
+      }
    },
    isChange(e){
      this.isJoin=e
@ -303,7 +508,11 @@ export default {
        this.$toast('行驶证副页照片不能为空')
        return
      }
-      if( !this.vehicleLicenseBack ) {
+      if( !this.vehicleLicenseCarPhoto ) {
+        this.$toast('行驶证车辆照片页不能为空')
+        return
+      }
+      if( !this.vehicleFrontPhoto ) {
        this.$toast('车头照片不能为空')
        return
      }
@ -315,16 +524,27 @@ export default {
        this.$toast('行驶证副页识别失败')
        return
      }
-        await saveVehicle({
+      if(!(this.selectedOption.length > 0)){
+        this.$toast('车辆类型不能为空')
+        return
+      }
+      if(this.selectedOption?.length==1 && this.selectedOption.includes(1)){//选择小修车时需清除原本的拖车服务类型
+        let data=this.oldSupplierServiceList.filter(item => item.name ==='拖车服务')
+        this.serviceIds = this.serviceIds.filter(item => !data[0].children.some(obj => obj.id === item));
+      }
+      await saveVehicle({
          vehicleId:this.id ? this.id : '',
          plateNumber:this.carNum ? this.carNum :'',
-          vehicleType:this.selectedOption ? this.selectedOption : '',
+          vehicleType:this.selectedOption?.length>0 ? this.selectedOption.join(',') : '',
          hasPolymerization:this.isJoin,
          serviceIds:this.serviceIds ? this.serviceIds : [],
          vehicleLicenseFront: this.vehicleLicenseFront,
          vehicleLicenseBack: this.vehicleLicenseBack,
          vehicleFrontPhoto: this.vehicleFrontPhoto,
          vehicleLicenseInfo: this.vehicleLicenseInfo,
+          vehicleLicenseCarPhoto: this.vehicleLicenseCarPhoto,
+          vehicleLicense: this.vehicleLicense,
+          vehicleFrontLicensePlate:this.vehicleFrontLicensePlate,
        })
        if(this.id){
          this.$toast('修改成功')
@ -443,4 +663,8 @@ export default {
    margin: 40px 0 30px 8px;
  }
 }
+.elSelect ::v-deep .el-input__inner{
+  border: none !important;
+  text-align: right !important;
+}
 </style>
--- a/src/views/index/workOrderDetail.vue
+++ b/src/views/index/workOrderDetail.vue
@ -70,6 +70,22 @@
        </div>
      </div>
    </div>
+    <div class="serviceInfo common" v-if="orderDetailInfo.batteryNo">
+      <div class="title">电瓶信息:</div>
+      <div class="line"></div>
+      <div class="infoContent">
+        <div class="item">
+          <span class="leftTitle fontColor">设备号:</span><span class="rightContent">{{orderDetailInfo?.batteryNo}}</span>
+        </div>
+        <div class="item">
+          <span class="leftTitle fontColor">品牌:</span><span class="rightContent">{{orderDetailInfo?.batteryBrand}}</span>
+        </div>
+        <div class="item">
+          <span class="leftTitle fontColor">型号:</span><span class="rightContent">{{orderDetailInfo?.batteryModel}}</span>
+        </div>
+      </div>
+    </div>
+
    <div class="map" v-show="showPopup"   id="container">
      <img @click="showPopup = false"  src="@/assets/delKey.png" class="mapImg">
    </div>
--- a/src/views/invoice/invoiceIndex.vue
+++ b/src/views/invoice/invoiceIndex.vue
@ -0,0 +1,13 @@
+<template>
+<div class="wrap">票务首页</div>
+</template>
+
+<script>
+export default {
+  name: "invoiceIndex"
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/src/views/kpi/components/noFit-table.vue
+++ b/src/views/kpi/components/noFit-table.vue
@ -13,6 +13,19 @@
          <template slot-scope="scope">{{scope.row[item.prop]}}  </template>
        </el-table-column>
      </template>
+      <template v-else-if="active===4">
+        <el-table-column v-for="(column,index) in filteredLabelList" :key="column.prop" :prop="column.prop" :label="column.label"
+                         :fixed="index===0" align="center"  min-width="100"
+                         :width="(isMobile && (column.label=='案件编号' || column.label=='服务内容')) ? 70 : 'auto'">
+          <template slot-scope="scope">
+            <span v-if="column.label === '师傅姓名'">
+              {{ scope.row[column.prop] }}
+              <span style=" color: #FFBA00;" v-if="scope.row.starRank"><i class="el-icon-star-on star"></i>{{scope.row.starRank}}</span>
+            </span>
+            <span v-else>{{ scope.row[column.prop] }}</span>
+          </template>
+        </el-table-column>
+      </template>
      <template v-else>
        <el-table-column v-for="column in labelList" :key="column.prop" :prop="column.prop" :label="column.label"
                         align="center"  min-width="100" :width="(isMobile && (column.label=='案件编号' || column.label=='服务内容')) ? 70 : 'auto'">
@ -31,6 +44,14 @@ export default {
  },
  mounted() {
  },
+  computed: {
+    filteredLabelList() {
+      if(this.active!==4){
+        return
+      }
+      return this.labelList.filter(column => column.label !== '星级评分');
+    }
+  },
  methods: {
    setTableCellStyle({ row, column,columnIndex }) {
      // 月总表格被转置，原始方法失效，重新定义对比
--- a/src/views/kpi/kpiIndex.vue
+++ b/src/views/kpi/kpiIndex.vue
@ -2,14 +2,21 @@
  <div class="wrap">
    <div v-if="isMobile" class="headWrap">
      <div class="title">KPI.数据看板</div>
-      <div class="titleName">{{ current }}月-{{supplierName}}</div>
+      <div class="titleName">{{ current }}-{{supplierName}}</div>
    </div>
    <div v-else class="webHeadWrap" :style="'justify-content:'+(isZd==1 ? 'space-between':'center')">
      <div class="empty" v-if="isZd==1"></div>
-      <div class="title">KPI.数据看板<span v-if="isZd==1">--中道救援</span><span v-if="isZd!=1">--{{ current }}月</span></div>
+      <div class="title">KPI.数据看板<span v-if="isZd==1">--中道救援</span><span v-if="isZd!=1">--{{ current }}</span></div>
      <!--  只有中道账号才显示搜索框  -->
      <div class="searchWrap" v-if="isZd==1">
-        <span class="month">{{ current }}月</span>
+        <el-date-picker
+            v-model="current"
+            type="month"
+            :clearable="false"
+            class="month custom-date-picker"
+            @change="monthChangeHandle"
+            placeholder="选择月">
+        </el-date-picker>
        <el-select
            v-model="supplierId"
            filterable
@ -18,7 +25,7 @@
            clearable
            placeholder="请输入后选择"
            :remote-method="remoteMethod"
-            @change="selectSupplierNameHanldle"
+            @change="selectSupplierNameHandle"
            :loading="selectLoading">
          <el-option
              v-for="item in selectOption"
@ -27,20 +34,20 @@
              :value="item.id">
          </el-option>
        </el-select>
-<!--        <i class="el-icon-search" @click="searchHandle"></i>-->
      </div>
    </div>
-    <van-tabs v-model="active" sticky @click="onClick">
+    <van-tabs v-model="active" sticky @click="tabClickHandle">
      <van-tab v-for="(item,index) in tabArr" :key="index" :title="item.name"></van-tab>
      <div v-if="isMobile && !([0,1,2,3].includes(active))" class="tipArrow left">{{ leftArr }}</div>
-      <div v-if="isMobile && !([8,9].includes(active))" class="tipArrow right">>>></div>
+      <div v-if="isMobile && !([9,10].includes(active))" class="tipArrow right">>>></div>
    </van-tabs>
    <div v-loading="loadingData" :class="{'contentWrap':true,'webcontentWrap':!isMobile}" v-if="active===0">
      <div :class="{'reciceOrder':true,'webCom':!isMobile}">
        <div :class="{'title':true,'webTitle':!isMobile}">接单指标</div>
        <div class="reciceOrderIWrap">
          <div class="left common">
-            <div class="num">{{ indexData && indexData.receiveOrderCount }}</div>
+<!--            indexData && -->
+            <div class="num">{{ formatCurrency(indexData?.receiveOrderCount) }}</div>
            <div class="itemTitle">承接案件量</div>
          </div>
          <div class="center common" @click="clickJumpHandle(5)">
@ -97,12 +104,15 @@
      </div>
      <div :class="{'reciceOrder':true,'webCom':!isMobile,'store':isMobile}">
        <div class="scoreTitle">
-          <span class="title">综合打分</span>
+          <div>
+            <span class="title" style="margin-right: 15px">综合打分</span>
+            <el-button v-if="!isMobile && isBtn && supplierId" size="mini" type="primary" @click="applicateHandle">信息变更申请</el-button>
+          </div>
          <i class="el-icon-question" @click.prevent="showScoreChart = !showScoreChart"></i>
        </div>
        <div class="storeWrap" v-if="indexData">
-          <circle-char v-if="showScoreChart"  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="'#00D273'" :is-store="true"></circle-char>
-          <div v-else class="detailScore">
+          <circle-char v-show="showScoreChart"  ref="Doughnut7" :data="indexData && indexData.score" :bg-color="'#00D273'" :is-store="true"></circle-char>
+          <div  v-show="!showScoreChart"  class="detailScore">
            <div class="left">
              <div>
                <span class="defen">接单得分:</span>
@ -111,7 +121,7 @@
                <span class="defen">接单时效得分:</span>
              </div>
              <div>
-                <span class="defen">到达时效得分:</span>
+                <span class="defen">接单时效得分:</span>
              </div>
              <div><span class="defen">聚合成功率得分:</span>
              </div>
@ -135,13 +145,13 @@
              <div> <span>{{ indexData.polymerizationSuccessScore }}</span></div>
              <div> <span>{{ indexData.appUseScore }}</span></div>
              <div> <span>{{ indexData.urgeScore }}</span></div>
-              <div><span>{{ indexData.complainScore }}</span></div>
+              <div><span>{{ indexData.urgeScore }}</span></div>
            </div>
          </div>
        </div>
      </div>
-      <div>
-
+      <div :class="{'allDataChartWrap':true,'webComAllData':!isMobile,'store':isMobile}">
+        <div  class="allDataChart" id="allDataChart" ></div>
      </div>
      <div v-if="isMobile" style="padding: 20px"></div>
    </div>
@ -192,8 +202,8 @@
        <noFit-table v-else :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
     </div>
    </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,3,4].includes(active)">
-      <div class="searchDriverName" v-if="[3,4].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[2,4,5].includes(active)">
+      <div class="searchDriverName" v-if="[5,4].includes(active)">
        <el-select
            v-model="driverName"
            filterable
@ -215,12 +225,12 @@
        </el-select>
      </div>
      <div :class="{'tabWrap':true,'webTabWrap':!isMobile,'mobileTab':isMobile}">
-        <div v-for="(item,index) in (active===3 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
+        <div v-for="(item,index) in (active===4 ? driverList : list)" :class="activeIndex===index ? 'active' : ''"
             :key="index"
             @click="changeTab(index)">{{ item.name }}
        </div>
      </div>
-      <div :class="{'comTab':true}">
+      <div :class="{'comTab':active !== 4,'comTabActive3':active === 4}">
        <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"></noFit-table>
      </div>
      <el-pagination
@ -235,22 +245,13 @@
          :total="total">
      </el-pagination>
    </div>
-    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[5,6,7,8,9].includes(active)">
+    <div v-loading="loadingData" class="contentWrap  monthTotal" v-if="[3,6,7,8,9,10].includes(active)">
      <div :class="{'comTab':true,'detailTable':isMobile}">
        <noFit-table :active='active'  :is-mobile='isMobile' :table-data="detailList" :label-list="labelList"
                     ></noFit-table>
      </div>
-<!--      <el-pagination
-          small
-          :current-page.sync="pageNum"
-          :page-size.sync="pageSize"
-          @current-change="getKpiData"
-          @size-change="getKpiData"
-          layout="prev, pager, next"
-          :total="total">
-      </el-pagination>-->
      <el-pagination
-          v-if="active !== 9"
+          v-if="active !== 10"
          small
          :page-sizes="[20, 50, 100]"
          :current-page.sync="pageNum"
@ -271,9 +272,9 @@ import {
  getKpiDetailsData,
  getStatisticsKpiByMonth,
  getStatisticsKpi,
-  getDriverStatisticsKpi,
  getSupplierId,
-  getDriverName
+  getDriverName,getDriverStatisticsKpi,
+  getRecentSupplierKpi, querySupplierDriverStatisticsScore
 } from "@/api/kpi.js"
 import {myMixins} from "@/utils/myMixins"
 import CircleChar from "@/views/kpi/components/circleChar.vue";
@ -288,12 +289,13 @@ export default {
    return {
      active:0,
      activeIndex: 0,
+      //
      tabArr: [
-        {name: '总览'}, {name: '月/总'}, {name: '日/总'}, {name: '月/师傅'}, {name: '日/师傅'}, {name: '拒单明细'},
+        {name: '总览'}, {name: '月/总'}, {name: '日/总'},{name: '师傅满意度'},{name: '月/师傅'}, {name: '日/师傅'},  {name: '拒单明细'},
        {name: '超时明细'}, {name: '投诉明细'}, {name: '不使用APP案件明细'}, {name: '车辆在线情况'}
      ],
      list: [{name: '接单指标'}, {name: '客户评价'}, {name: 'APP使用'}, {name: ' 时效 '}],
-      driverList: [{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],
+      driverList: [{name: '得分总览'},{name: '接单情况'}, {name: '服务评价'}, {name: 'APP使用情况'}, {name: '时效 '}],
      startMonthTime: '',
      startTime: '',
      endTime: '',
@ -313,7 +315,8 @@ export default {
      xAxisArr: [],
      isMobile: false,
      isZd: '',
-      current: dayjs(new Date()).format('M'),
+      current:'',
+      // current: dayjs(new Date()).format('M'),
      supplierName:'',
      value: '1',
      options: [
@ -332,36 +335,72 @@ export default {
      driverselectLoading: false,
      driverselectOption: [],
      leftArr:'<<<',
-      showScoreChart:true
+      showScoreChart:true,
+      continueMonthKpi:[],
+      isBtn:false,//是否有信息变更申请按钮权限
    }
  },
-  async mounted() {
-    await this.checkMobile();
-    await this.initDate();
-    await this.getData();
-  },
  created() {
    this.checkMobile();
    const urlParams = new URLSearchParams(window.location.search);
    this.isZd = urlParams?.get('isZd') || ''
-   /* if(!this.isMobile && this.isZd && this.isZd==1){
-      this.supplierId='1127'
-    }*/
+    this.supplierId = urlParams?.get('supplierId') || ''
+    this.isBtn= Number(urlParams?.get('isBtn'))
  },
-  async activated() {
+  async mounted() {
+    await this.checkMobile();
+    await this.initDate();
+    await this.selectSupplierNameHandle();
  },
  methods: {
-    async selectSupplierNameHanldle(){
+    applicateHandle() {
+      if (window.parent) {
+        const hasListener = window.parent.dispatchEvent(new Event('checkCloseDialog'));
+        if (hasListener) {
+          const data = {
+            action: 'closeDialog',
+            message: this.supplierId,
+            // 其他需要传递的参数
+          };
+          window.parent.postMessage(data, '*');
+          // window.parent.postMessage('closeDialog', '*');
+        } else {
+          window.history.back();
+        }
+      }
+    },
+    monthChangeHandle(value){
+      if (value) {
+        const year = value.getFullYear();
+        const month = value.getMonth() + 1; // 月份从 0 开始，需要加 1
+        const yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
+        this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
+        this.startTime = `${year}-${this.padZero(month)}-01 00:00:00`;
+        const lastDay = new Date(year, month, 0).getDate(); // 获取该月的最后一天
+        this.endTime = `${year}-${this.padZero(month)}-${this.padZero(lastDay)} 23:59:59`;
+        this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
+        console.log(" this.startMonthTime", this.startMonthTime)
+        this.selectSupplierNameHandle();
+        if(this.active===1){
+          this.tabClickHandle()
+        }
+      }
+    },
+    padZero(num) {
+      return num < 10 ? `0${num}` : num;
+    },
+    async selectSupplierNameHandle(){
      await this.getData()
-      setTimeout(()=>{
-        this.$refs.Doughnut1.initCircle()
-        this.$refs.Doughnut2.initCircle()
-        this.$refs.Doughnut3.initCircle()
-        this.$refs.Doughnut4.initCircle()
-        this.$refs.Doughnut5.initCircle()
-        this.$refs.Doughnut6.initCircle()
-        this.$refs.Doughnut7.initCircle()
-      },1500)
+      if(this.active !== 0){
+        return
+      }
+      this.$refs.Doughnut1.initCircle()
+      this.$refs.Doughnut2.initCircle()
+      this.$refs.Doughnut3.initCircle()
+      this.$refs.Doughnut4.initCircle()
+      this.$refs.Doughnut5.initCircle()
+      this.$refs.Doughnut6.initCircle()
+      this.$refs.Doughnut7.initCircle()
    },
    async remoteMethod(query) {
      if (query !== '') {
@ -394,9 +433,6 @@ export default {
        this.driverselectOption = [];
      }
    },
-    async searchHandle() {//web端服务商搜索操作
-      console.log("搜索按钮")
-    },
    async changeHandle() {
      this.v1=[]
      this.v2=[]
@ -422,30 +458,48 @@ export default {
        this.xAxisArr = []
        this.etlDetailList=[]
        this.etlLabelList=[]
+        this.continueMonthKpi=[]
        await this.getKpiData()
        this.loadingData = false
      } finally {
        this.loadingData = false
      }
    },
+    // 格式化承接案件量数据
+    formatCurrency(value) {
+      if (!value) return '';
+      let num = parseInt(value);
+      return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    },
+    formatCurrency1(value) {
+      if (!value) return ''; // 如果值为空，返回空字符串
+      // 如果值已经包含逗号，直接返回原值
+      if (value.toString().includes(',')) {
+        return value;
+      }
+      // 否则，添加千分号
+      let num = parseInt(value);
+      if (isNaN(num)) return ''; // 如果转换失败，返回空字符串
+      return num.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    },
    async clickJumpHandle(type) {
      this.loading = true
      this.active = type;
-      await this.onClick();
+      await this.tabClickHandle();
    },
-    onClick() {
+    tabClickHandle() {
      this.activeIndex = 0;
      this.detailList = [];
      this.labelList = [];
      this.driverName=''
-      this.getData();
+      this.selectSupplierNameHandle();
      if (this.active === 1) {
        setTimeout(() => {
          this.drawLine()
          if (!this.isMobile && this.activeIndex === 3) {
            this.drawLine1()
          }
-        }, 500)
+        }, 1000)
      }
    },
    drawLine() { // 基于准备好的dom，初始化echarts实例
@ -455,13 +509,16 @@ export default {
      let series1 = [{
        name: '派遣案件量',
        type: 'bar',
-        data: this.v1,
+        data: this.v1?.map(item => Number(item?.toString()?.replace(/,/g, ''))),
        yAxisIndex: 0,
        smooth: true,
        barWidth: this.isMobile ? 35 : 60,
        label: {
          show: true, // 显示标签
          position: 'top', // 标签位置在柱形顶部
+          formatter: (params) => {
+            return params.value.toLocaleString();
+          }
        }
      },
        {
@ -845,49 +902,123 @@ export default {
      };
      option && myChart.setOption(option, true);
    },
+    async allDataChart(){
+      let res = await getRecentSupplierKpi({
+        startTime: this.startTime,
+        endTime: this.endTime,
+        statisticsType: 1,
+        supplierId: this.supplierId,
+        driverId: this.driverId,
+        driverName:this.driverName,
+      });
+      this.continueMonthKpi=res.data;
+      // 初始化 v1 ,v2数组，长度为 12，初始值为 0
+      let v1 = new Array(12).fill(0);
+      let v2 = new Array(12).fill(0);
+      if( this.continueMonthKpi.length>0){
+        this.continueMonthKpi.forEach(item=>{
+          let month = parseInt(item.statisticsDate?.split('-')[1], 10) - 1; // 获取月份，并转换为数组索引
+          v1[month] = item.dispatchOrderCount;
+          v2[month] = item.orderScore;
+        })
+      }
+      let myChart = echarts.init(document.getElementById('allDataChart'))
+      let option = {
+        grid: {
+          top: '15%',
+          bottom: '12%',
+        },
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'cross',
+            crossStyle: {
+              color: '#999'
+            }
+          }
+        },
+        legend: {  },
+        xAxis: [
+          {
+            type: 'category',
+            data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
+            axisPointer: {
+              type: 'shadow'
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            axisLabel: {
+              formatter: '{value}',
+              rotate: 45,
+              margin: 2
+            }
+          },
+          {
+            type: 'value',
+            axisLabel: {
+              formatter: '{value}',
+            }
+          }
+        ],
+        series: [
+          {
+            name: '案件量',
+            type: 'bar',
+            yAxisIndex: 0,
+            data:v1
+          },
+          {
+            name: '总分',
+            type: 'line',
+            yAxisIndex: 1,
+            data: v2
+          }
+        ]
+      };
+      option && myChart.setOption(option, true);
+    },
+    // 通用函数，用于处理百分比数据
+    processPercentage(value) {
+      value *= 100;
+      if (value % 1 !== 0) {
+        value = value.toFixed(2);
+      }
+      return value;
+    },
    async getKpiData() {
      try {
        this.loading = true
        if (this.active === 0) {
+          await this.allDataChart()
          let res = await getStatisticsKpiByMonth({
            startTime: this.startTime,
            endTime: this.endTime,
            statisticsType: 1,
            supplierId: this.supplierId,
          });
+          if(!res.data){
+            return
+          }
          this.indexData = res.data;
          this.supplierName=res.data?.supplierName
-          this.indexData.refuseOrderRate=this.indexData.refuseOrderRate*100
-          if (this.indexData.refuseOrderRate % 1 !== 0) {
-            this.indexData.refuseOrderRate = this.indexData.refuseOrderRate.toFixed(2);
-          }
-          this.indexData.timeoutOrderRate=this.indexData.timeoutOrderRate*100
-          if (this.indexData.timeoutOrderRate % 1 !== 0) {
-            this.indexData.timeoutOrderRate = this.indexData.timeoutOrderRate.toFixed(2);
-          }
-          this.indexData.complainOrderRate=this.indexData.complainOrderRate*100
-          if (this.indexData.complainOrderRate % 1 !== 0) {
-            this.indexData.complainOrderRate = this.indexData.complainOrderRate.toFixed(2);
-          }
-          this.indexData.customerSatisfaction=this.indexData.customerSatisfaction*100
-          if (this.indexData.customerSatisfaction % 1 !== 0) {
-            this.indexData.customerSatisfaction = this.indexData.customerSatisfaction.toFixed(2);
-          }
-          this.indexData.threeMinutesContactRate=this.indexData.threeMinutesContactRate*100
-          if (this.indexData.threeMinutesContactRate % 1 !== 0) {
-            this.indexData.threeMinutesContactRate = this.indexData.threeMinutesContactRate.toFixed(2);
-          }
-          this.indexData.urgeRate=this.indexData.urgeRate*100
-          if (this.indexData.urgeRate % 1 !== 0) {
-            this.indexData.urgeRate = this.indexData.urgeRate.toFixed(2);
-          }
-          this.indexData.appRate=this.indexData.appRate*100
-          if (this.indexData.appRate % 1 !== 0) {
-            this.indexData.appRate = this.indexData.appRate.toFixed(2);
-          }
-          this.indexData.polymerizationSuccessRate=this.indexData.polymerizationSuccessRate*100
-          if (this.indexData.polymerizationSuccessRate % 1 !== 0) {
-            this.indexData.polymerizationSuccessRate = this.indexData.polymerizationSuccessRate.toFixed(2);
+          // 需要处理的属性名数组
+          const propertiesToProcess = [
+            'refuseOrderRate',
+            'timeoutOrderRate',
+            'complainOrderRate',
+            'customerSatisfaction',
+            'threeMinutesContactRate',
+            'urgeRate',
+            'appRate',
+            'polymerizationSuccessRate'
+          ];
+          for (let key in this.indexData){
+            if (propertiesToProcess.includes(key)) {
+              this.indexData[key] = this.processPercentage(this.indexData[key]);
+            }
          }
        } else if ([1, 2].includes(this.active)) {
          let res = await getStatisticsKpi({
@ -916,32 +1047,57 @@ export default {
            item.minorFortyMinutesArrivalRate=this.formatPercentage(item.minorFortyMinutesArrivalRate) ;
            let formatVal = dayjs(item.statisticsDate).format('DD');
            let formatVal1 = dayjs(item.statisticsDate).format('M');
-            return {...item, date: formatVal, month: (formatVal1 == this.current) ? '本月' : (formatVal1 + '月')};
+            // console.log("formatVal1",formatVal1)
+            // return {...item, date: formatVal, month: (formatVal1 == this.current) ? '本月' : (formatVal1 + '月')};
+            return {...item, date: formatVal, month: formatVal1 + '月'};
          });
          this.loading = false
          this.detailList?.map(item => {
            this.xAxisArr.push(item.month)
+            this.xAxisArr = [...new Set(this.xAxisArr)]; // 去重
          })
-          this.xAxisArr[this.xAxisArr.length - 1] = '本月'
+          console.log(" this.xAxisArr", this.xAxisArr)
+          // this.xAxisArr[this.xAxisArr.length - 1] = '本月'
          await this.twoTabHanldeData()
-        } else if ([3, 4].includes(this.active)) {
-          let res = await getDriverStatisticsKpi({
+        }else if (this.active === 3) {
+          let res = await querySupplierDriverStatisticsScore({
            startTime: this.startTime ,
            endTime: this.endTime,
-            statisticsType: this.active === 3 ? 1 : 2,
+            statisticsType: 1,
+            supplierId: this.supplierId,
+            driverId: this.driverId,
+            driverName:this.driverName,
+            pageNum: this.pageNum,
+            pageSize: this.pageSize
+          })
+          this.total = res.total
+          this.detailList = res.data?.map(item => {
+            let formatVal = dayjs(item.statisticsDate).format('DD');
+            return {...item, date: formatVal};
+          });
+          this.labelList = [
+            {label: '师傅姓名', prop: 'driverName'},
+            {label: '案件总量', prop: 'orderCount'},
+            {label: '满意度得分  ', prop: 'driverSatisfaction'},
+          ]
+          this.loading = false;
+        }
+        else if ([4,5].includes(this.active)) {
+          let res = await getDriverStatisticsKpi({
+            startTime: this.startTime ,
+            endTime: this.endTime,
+            statisticsType:this.active === 4 ? 1 : 2,
            supplierId: this.supplierId,
            driverId: this.driverId,
            driverName:this.driverName,
            pageNum: this.pageNum,
            pageSize: this.pageSize
          })
-          // this.detailList = res.data
          this.total = res.total
          this.detailList = res.data?.map(item => {
            item.refuseOrderRate=this.formatPercentage(item.refuseOrderRate) ;
            item.timeoutOrderRate=this.formatPercentage(item.timeoutOrderRate) ;
            item.cancelRate=this.formatPercentage(item.cancelRate) ;
-            // item.urgeRate=this.formatPercentage(item.urgeRate) ;
            item.complainOrderRate=this.formatPercentage(item.complainOrderRate) ;
            item.customerEvaluateRate=this.formatPercentage(item.customerEvaluateRate) ;
            item.appRate=this.formatPercentage(item.appRate) ;
@ -957,12 +1113,13 @@ export default {
            return {...item, date: formatVal};
          });
          this.loading = false;
-          if(this.active===4 && !this.driverName){
+          if(this.active===5 && !this.driverName){
            this.detailList=[]
            this.total=0
          }
          await this.twoTabHanldeData();
-        } else if ([5, 6, 7, 8, 9].includes(this.active)) {
+        }
+        else if ([ 6, 7, 8,9,10].includes(this.active)) {
          this.detailList = []
          this.labelList = []
          let result = await getKpiDetailsData({
@ -979,7 +1136,7 @@ export default {
            return {...item, date: formatVal};
          });
          this.loading = false
-          if (this.active === 5) {//拒单明细
+          if (this.active === 6) {//拒单明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -990,7 +1147,7 @@ export default {
              {label: '中道派单时间', prop: 'dispatchTime'},
              {label: '拒绝原因', prop: 'reason'},
            ]
-          } else if (this.active === 6) {//超时明细
+          } else if (this.active === 7) {//超时明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -1000,7 +1157,7 @@ export default {
              {label: '上游接单来源', prop: 'workSource'},
              {label: '中道派单时间', prop: 'dispatchTime'},
            ]
-          } else if (this.active === 7) {//投诉明细
+          } else if (this.active === 8) {//投诉明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -1009,8 +1166,7 @@ export default {
              {label: '投诉时间', prop: 'complainCreateTime'},
              {label: '投诉类型', prop: 'complainTypeString'},
            ]
-          } else if (this.active === 8) {//不使用App案件明细
-            // console.log("不使用App案件明细")
+          } else if (this.active === 9) {//不使用App案件明细
            this.labelList = [
              {label: '案件编号', prop: 'orderCode'},
              {label: '服务内容', prop: 'serviceName'},
@ -1018,7 +1174,7 @@ export default {
              {label: '工单创建时间', prop: 'orderCreateTime'},
              {label: '事发地', prop: 'vehiclePointAddress'},
            ]
-          } else if (this.active === 9) {//车辆在线情况
+          } else if (this.active === 10) {//车辆在线情况
            this.labelList = [
              {label: '日期', prop: 'date'},
              {label: '0点在线车辆数量', prop: 'zeroClockVehicleCount'},
@ -1027,7 +1183,6 @@ export default {
              {label: '16点在线车辆数量', prop: 'sixteenClockVehicleCount'},
              {label: '20点在线车辆数量', prop: 'twentyClockVehicleCount'},
              {label: '22点在线车辆数量', prop: 'twentyTwoClockVehicleCount'},
-
            ]
          }
        }
@ -1043,16 +1198,23 @@ export default {
        return result.toFixed(2) + '%';
      }
    },
-    checkMobile() {
-      const userAgent = navigator.userAgent || navigator.vendor || window.opera;
-      this.isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent);
-    },
    // 初始化获取当月日期
    initDate() {
+      let year=''
+      let month=''
+      if( this.current ) {
+        year = new Date(this.current).getFullYear();
+        month = new Date(this.current).getMonth() + 1;
+      } else {
+        year = new Date().getFullYear();
+        month = new Date().getMonth() + 1;
+      }
+      let yearAndMonth = year + '-' + (month > 9 ? month : '0' + month);
+      this.current = dayjs(new Date(yearAndMonth)).format('YYYY-MM')
      this.startTime = dayjs(new Date()).format('YYYY-MM') + '-01 00:00:00'
      this.endTime = dayjs(new Date()).format('YYYY-MM') + '-' + this.getDayLen()+' 23:59:59'
      this.startMonthTime=this.getStartTimeFromEndTime(this.endTime)
-      console.log(this.startTime,this.endTime,this.startMonthTime)
+      console.log(" this.startMonthTime", this.startMonthTime,this.startTime)
    },
    // 获取当月天数
    getDayLen() {
@ -1113,6 +1275,12 @@ export default {
            { 'month': '拒单量' },{ 'month': '拒单率(%)' },{ 'month': '超时接单量' },{ 'month': '超时率(%)' },{ 'month': '客户取消率(%)' }]
          let props = 'prop' //自定义字段名称
          this.detailList?.map((item,index) => {
+
+            item.dispatchOrderCount=this.formatCurrency1( item.dispatchOrderCount);
+            item.receiveOrderCount=this.formatCurrency1( item.receiveOrderCount);
+            item.finishOrderCount=this.formatCurrency1( item.finishOrderCount);
+            item.refuseOrderCount=this.formatCurrency1( item.refuseOrderCount);
+            item.timeoutOrderCount=this.formatCurrency1( item.timeoutOrderCount);
            this.v1.push(item.dispatchOrderCount)
            this.v2.push(item.refuseOrderRate.replace('%', ''))
            this.v3.push(item.timeoutOrderRate.replace('%', ''))
@ -1200,13 +1368,11 @@ export default {
                this.v2.push(item.threeMinutesReceivingRate.replace('%', ''))
              })
            } else {
-              console.log(" this.detailList师傅接单时效", this.detailList)
              this.detailList?.map(item => {
                this.v1.push(item.arriving)
                this.v2.push(item.polymerizationSuccessArriving)
                this.v3.push(item.fortyMinutesArrivalRate.replace('%', ''))
              })
-              console.log("this.v1",this.v1,this.v2,this.v3)
            }
            this.detailList?.map((item,index) => {
              const columnObj = {}
@ -1292,8 +1458,40 @@ export default {
            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
          ]
        }
-      } else if (this.active === 3) {
+      }
+     /* else if(this.active === 3){
+
+      } */
+      else if (this.active === 4) {
        if (this.activeIndex === 0) {
+          this.labelList = [
+            {label: '师傅姓名', prop: 'driverName'},
+            {label: '总分', prop: 'score'},
+            {label: '案件总量', prop: 'orderCount'},
+            {label: '累计得分', prop: 'cumulativeScore'},
+            {label: '两分钟内接单得分', prop: 'twoMinutesAcceptScore'},
+            {label: '1分钟内联系客户得分', prop: 'oneMinutesContactCustomerScore'},
+            {label: '联系成功得分', prop: 'contactSuccessScore'},
+            {label: '准时到达B点得分', prop: 'arriveBScore'},
+            {label: '准时到达C点得分', prop: 'arriveCScore'},
+            {label: '服务成功得分', prop: 'serviceSuccessScore'},
+            {label: '必传照片上传得分', prop: 'uploadPhotoScore'},
+            {label: '审核一次通过得分', prop: 'auditScore'},
+            {label: '平安案件无评价扣分', prop: 'pinganNoCommentDeduct'},
+            {label: '案件差评扣分', prop: 'orderNegativeDeduct'},
+            {label: '催促扣分', prop: 'urgeDeduct'},
+            {label: '有责车损扣分', prop: 'responsibleDeduct'},
+            {label: '有责投诉（非态度类）扣分', prop: 'complaintNoAttitudeDeduct'},
+            {label: '有责投诉（态度类）扣分', prop: 'complaintAttitudeDeduct'},
+            {label: '拒单扣分', prop: 'rejectDeduct'},
+            {label: '超时扣分', prop: 'timeoutDeduct'},
+            {label: '聚合成功得分', prop: 'polymerizationSuccessScore'},
+            {label: '聚合失败扣分', prop: 'polymerizationFailDeduct'},
+            {label: '每月培训得分', prop: 'trainingScore'},
+            {label: '新手入列得分', prop: 'listedScore'},
+            {label: '星级评分', prop: 'starRank'},
+          ]
+        }if (this.activeIndex === 1) {
          this.labelList = [
            {label: '师傅姓名', prop: 'driverName'},
            {label: '承接案件量', prop: 'receiveOrderCount'},
@ -1302,7 +1500,7 @@ export default {
            {label: '超时接单量', prop: 'timeoutOrderCount'},
            {label: '超时率(%)', prop: 'timeoutOrderRate'},
          ]
-        } else if (this.activeIndex === 1) {
+        } else if (this.activeIndex === 2) {
          this.labelList = [
            {label: '师傅姓名', prop: 'driverName'},
            {label: '承接案件量', prop: 'receiveOrderCount'},
@ -1312,7 +1510,7 @@ export default {
            {label: '客户评价率(%)', prop: 'customerEvaluateRate'},
            {label: '催促率(%)', prop: 'urgeRate'},
          ]
-        } else if (this.activeIndex === 2) {
+        } else if (this.activeIndex === 3) {
          this.labelList = [
            {label: '师傅姓名', prop: 'driverName'},
            {label: '承接案件量', prop: 'receiveOrderCount'},
@ -1324,7 +1522,7 @@ export default {
            {label: '总聚合成功率(%)', prop: 'polymerizationSuccessRate'},
            {label: '日均在线时长(h)', prop: 'onlineDuration'},
          ]
-        } else if (this.activeIndex === 3) {
+        } else if (this.activeIndex === 4) {
          this.labelList = [
            {label: '师傅姓名', prop: 'driverName'},
            {label: '接单时效(分)', prop: 'receiving'},
@ -1334,7 +1532,7 @@ export default {
            {label: '聚合成功到达时效(分)', prop: 'polymerizationSuccessArriving'},
          ]
        }
-      } else if (this.active === 4) {
+      } else if (this.active === 5) {
        if (this.activeIndex === 0) {//接单指标
          this.labelList = [
            {label: '日', prop: 'date'},
@ -1383,17 +1581,21 @@ export default {
        }
      }
    },
+    checkMobile() {
+      const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+      this.isMobile = /android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(userAgent);
+    },
    setType(type) {
      switch (type) {
-        case 5:
-          return 1;
        case 6:
-          return 2;
+          return 1;
        case 7:
-          return 3;
+          return 2;
        case 8:
-          return 4;
+          return 3;
        case 9:
+          return 4;
+        case 10:
          return 5;
      }
    },
@ -1460,19 +1662,6 @@ export default {
    display: flex;
    align-items: center;
    position: relative;
-
-    .month {
-      display: inline-block;
-      width: 45px;
-      height: 30px;
-      line-height: 30px;
-      text-align: center;
-      border-radius: 20px 0px 0px 20px;
-      border: 1px solid #4C81F5;
-      font-size: 14px;
-      color: #FFFFFF;
-    }
-
    .el-icon-search {
      font-size: 15px;
      color: #4C81F5;
@ -1554,12 +1743,6 @@ export default {
        display: flex;
        justify-content:center;
      }
-
-     /* .defen{
-        display: inline-block;
-        //width: 92px;
-        //text-align: right;
-      }*/
      .left{
        text-align: right;
        padding-right: 5px;
@ -1612,7 +1795,24 @@ export default {
      margin-bottom: 0 !important;
    }
  }
+  .allDataChartWrap{
+  /*  width: 375px;
+    height: 220px;*/
+    @include whBg(375px, 200px, #FFFFFF);

+  }
+  .allDataChart{
+    width: 100%;
+    height: 100%;
+  }
+  .webComAllData{
+    width: 420px;
+    height: 200px;
+    /*width: 375px;
+    height: 146px;*/
+    float: left;
+    margin: 10px;
+  }
  .webCom {
    @include whBg(420px, 200px, #FFFFFF);
    float: left;
@ -1727,7 +1927,6 @@ export default {
  width: 100%;
  height: 95%;
 }
-
 ::v-deep .el-table {
  height: 100%;
 }
@ -1735,7 +1934,11 @@ export default {
 ::v-deep .el-table--scrollable-x .el-table__body-wrapper {
  height: 95% !important;
 }
-
+.comTabActive3 ::v-deep .el-table--scrollable-x .el-table__body-wrapper{
+  width: 100%;
+  //height: 90%;
+  //height: 84% !important;
+}
 .chartWrapWeb, .webTab {
  height: calc(100% - 200px);
  width: 100%;
@ -1803,4 +2006,47 @@ export default {
 ::v-deep .el-switch__label * {
  font-size: 12px;
 }
+/* 自定义样式 */
+.custom-date-picker ::v-deep .el-input__prefix{
+  display: none;
+}
+.month {
+  display: inline-block;
+  width: 75px;
+  //height: 30px;
+  //line-height: 30px;
+  text-align: center;
+  border-radius: 20px 0px 0px 20px;
+  //border-radius: 0px 20px 20px 0px;
+  //border: 1px solid #4C81F5;
+  font-size: 14px;
+  color: #FFFFFF;
+  ::v-deep .el-input--suffix .el-input__inner{
+
+  }
+  ::v-deep .el-input__inner{
+    padding-left: 0 !important;
+    padding-right: 0 !important;
+    border-radius: 20px 0px 0px 20px !important;
+    text-align: center !important;
+    font-size: 14px  !important;
+    color: #FFFFFF !important;
+    border: 1px solid #4C81F5 !important;
+    background-color: transparent !important;
+  }
+  /* 自定义清除按钮样式 */
+  .custom-date-picker ::v-deep .el-input__suffix {
+    right: 0 !important;
+    padding-right: 10px !important;
+  }
+
+  .custom-date-picker ::v-deep .el-input__suffix-inner {
+    display: flex;
+    align-items: center;
+  }
+
+  .custom-date-picker ::v-deep .el-input__icon {
+    line-height: 1 !important;
+  }
+}
 </style>
--- a/src/views/secondHandCar/carSource.vue
+++ b/src/views/secondHandCar/carSource.vue
@ -0,0 +1,795 @@
+<template>
+  <div class="wrap" >
+    <div class="headerWrap">
+      <img class="bg" src="@/assets/secondHandCar/bg.png" />
+      <div class="navWrap">
+        <div v-if="isWebFunc()" style="opacity: 0;" class="back"></div>
+        <img v-else class="back" @click="backHandle" src="@/assets/secondHandCar/back.png" />
+        <img class="navIcon" src="@/assets/secondHandCar/cheyuan_big.png" />
+        <div style="opacity: 0;" class="back"></div>
+      </div>
+      <div class="audit" v-if="status==3 && auditRemark">
+        <span><img class="noAudit" src="@/assets/secondHandCar/noAudit.png" />审核不通过：</span>
+        <span>{{auditRemark}}</span>
+      </div>
+      <div class="audit supplierInfo" v-if="type==2">
+        <div><span>供应商名称：</span><span>{{supplierName}}</span></div>
+        <div><span>供应商编号：</span><span>{{supplierCode}}</span></div>
+      </div>
+    </div>
+    <div class="contentWrap" :style="id ? 'height: calc(100% - 100px);' : 'height: calc(100% - 42px);'" :class="[type==1 ? 'noContentAudit': 'hasContentAudit']">
+      <div class="oneContent content">
+        <img class="sort" src="@/assets/secondHandCar/one_cheyuan.png"  />
+        <div class="uploadWrap">
+          <upload-common  @success1="getDrivingLicense"  @delete1="deleteImg1"
+                         :text="'行驶证照片'" :multiple="false" :files.sync="vehicleLicensePhotoList"/>
+          <upload-common  @success2="getPlateColor"  @delete2="deleteImg2"
+                         :text="'车辆45度照'" :multiple="false" :files.sync="vehicleAnglePhotoList" />
+          <upload-common  @success4="getBackPhoto"  @delete4="deleteImgBack"
+                          :text="'车辆后方45度'" :multiple="false" :files.sync="vehicleRearPhotoList" />
+          <upload-common @success3="getOtherImg"   @delete3="handleDeleteOtherImg"
+                         :text="'其他照片0/6'" :multiple="true"  :files.sync="otherImgSrcList"/>
+        </div>
+      </div>
+      <div class="line"></div>
+      <div  class="twoContent content">
+        <img class="sort" src="@/assets/secondHandCar/two_desc.png"  />
+        <div class="ocrInfo">
+          <div class="item"><span>牌照类型</span><span class="orc">{{ form.licenseType==1 ? '蓝牌' : (form.licenseType==2 ? '黄牌' : (form.licenseType==3 ? '绿牌' : '')) }}</span></div>
+          <div class="item"><span>上装品牌</span><span class="orc">{{form.brandModel}}</span></div>
+          <div class="item"><span>注册日期</span><span class="orc">{{form.registerDate?.substring(0,10)}}</span></div>
+        </div>
+        <div class="item vehicleTypeItem">
+          <span> <span class="star">*</span>车辆类型 </span>
+          <van-radio-group v-model="form.vehicleType" direction="horizontal" class="radioWrap">
+            <van-radio name="平板拖车" :class="{'checked':form.vehicleType=='平板拖车','vehicleRadio':true}">平板拖车</van-radio>
+            <van-radio name="地库车" :class="{'checked':form.vehicleType=='地库车','vehicleRadio':true}">地库车</van-radio>
+            <van-radio name="牵引车" :class="{'checked':form.vehicleType=='牵引车','vehicleRadio':true}">牵引车</van-radio>
+            <van-radio name="随车吊" :class="{'checked':form.vehicleType=='随车吊','vehicleRadio':true}">随车吊</van-radio>
+          </van-radio-group>
+        </div>
+        <div class="item" v-if="form.vehicleType=='平板拖车'">
+          <span> <span class="star">*</span>落板方式 </span>
+          <van-radio-group v-model="form.boardType" direction="horizontal" class="radioWrap">
+            <van-radio name="1" :class="{'checked':form.boardType==1}">全落地</van-radio>
+            <van-radio name="2" :class="{'checked':form.boardType==2}">斜落一体</van-radio>
+            <van-radio name="3" :class="{'checked':form.boardType==3}">普通斜板</van-radio>
+          </van-radio-group>
+        </div>
+        <div class="item">
+          <span> <span class="star">*</span>排放标准 </span>
+          <van-radio-group v-model="form.emissionStandard" direction="horizontal" class="radioWrap">
+            <van-radio name="3" :class="{'checked':form.emissionStandard==3}">国3</van-radio>
+            <van-radio name="4" :class="{'checked':form.emissionStandard==4}">国4</van-radio>
+            <van-radio name="5" :class="{'checked':form.emissionStandard==5}">国5</van-radio>
+            <van-radio name="6" :class="{'checked':form.emissionStandard==6}">国6</van-radio>
+          </van-radio-group>
+        </div>
+        <div class="item">
+          <span> <span class="star">*</span>刹车系统 </span>
+          <van-radio-group v-model="form.brakeSystem" direction="horizontal" class="radioWrap">
+            <van-radio name="1" :class="{'checked':form.brakeSystem==1}">气刹</van-radio>
+            <van-radio name="2" :class="{'checked':form.brakeSystem==2}">油刹</van-radio>
+          </van-radio-group>
+        </div>
+        <div class="item">
+          <span> <span class="star">*</span>所在城市 </span>
+          <van-field
+              @focus="areaShow = true"
+              class="radioWrap"
+              readonly
+              v-model="areaName"
+              input-align="right"
+
+
+          > </van-field>
+        </div>
+        <div class="item">
+          <span> <span class="star">*</span>行驶里程 </span>
+          <van-field
+              type="number"
+              class="radioWrap"
+              v-model="form.mileage"
+              input-align="right"
+          >
+            <template slot="right-icon" >
+             <span style="white-space: nowrap;  margin-left: 8px;"> 公里 </span>
+            </template>
+          </van-field>
+        </div>
+        <div class="item">
+          <span> <span class="star">*</span>联系号码 </span>
+          <van-field
+              type="number"
+              class="radioWrap"
+              v-model="form.contactNumber"
+              input-align="right"
+
+          > </van-field>
+        </div>
+        <div class="item">
+          <span> <span class="star">*</span>售价(含税)</span>
+          <van-field
+              type="number"
+              class="radioWrap"
+              v-model="form.minPrice"
+              @input="validatePrice"
+              input-align="right"
+          >
+            <template slot="right-icon" >
+              <span style="white-space: nowrap;  margin-left: 8px;"> 元 </span>
+            </template>
+          </van-field>
+        </div>
+        <div class="item" style="margin-bottom:20px">
+          <span> <span class="star">*</span>底盘品牌</span>
+          <van-field
+            class="radioWrap"
+            v-model="form.underpanBrand"
+            input-align="right"
+          >
+          </van-field>
+        </div>
+      </div>
+      <div class="line lastLine"></div>
+      <div  class="threeContent content">
+        <img class="sort" src="@/assets/secondHandCar/three.png"  />
+        <el-input class="ipt" v-model.trim="form.desc" type="textarea"  :autosize="{ minRows: 6, maxRows: 6 }"
+                  maxlength="500" show-word-limit placeholder="描述车辆信息：如事故、额外加装、无线遥控"></el-input>
+        <div v-if="type==2" style="margin: 10px 3px">不通过原因</div>
+        <el-input v-if="type==2"  class="ipt" v-model.trim="auditReason" type="textarea"  :autosize="{ minRows: 2, maxRows: 6 }"
+                  maxlength="200" show-word-limit placeholder="请填写不通过原因"></el-input>
+        <div class="checkedWrap" v-if="type==1">
+          <img v-show="radio==1" @click="radio=0" class="radioIcon" src="@/assets/secondHandCar/checked.png" />
+          <img v-show="radio==0" @click="radio=1" class="radioIcon" src="@/assets/secondHandCar/uncheck.png" />
+          <span>我已阅读并同意</span>
+          <span @click="viewPrivacy">《二手车交易条款》</span>
+        </div>
+        <div class="btnWrap" >
+          <div v-if="type==1" class="btn commonBtn"  @click="noMultipleClicks(submitHandle)">发布</div>
+          <div v-if="type==2" class="auditBtn">
+            <div  class="commonBtn" @click="noMultipleClicks(auditHandle,0)">审核不通过</div>
+            <div  class="commonBtn" @click="noMultipleClicks(auditHandle,1)"><span style="margin-right: 6px">✔</span>审核通过</div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <van-popup
+        v-model="areaShow"
+        closeable
+        position="bottom"
+    >
+      <van-area title="标题" :area-list="areaList" :columns-num="2"  closeable="true" :value="form.areaCode ? String(form.areaCode) : ''"
+                @cancel="areaShow = false" @confirm="confirmHandle"/>
+    </van-popup>
+ </div>
+</template>
+<script>
+import {publishCarInfo,carInfoDetail,auditCarInfo} from "@/api/secondHandCar"
+import {myMixins} from "@/utils/myMixins"
+import uploadCommon from "@/views/secondHandCar/components/upload-common.vue";
+import {areaList} from "@vant/area-data";
+export default {
+  name: "carSource",
+  mixins:[myMixins],
+  components:{uploadCommon},
+  data(){
+    return{
+      form:{
+        id:'',
+        type:1,
+        vehicleLicensePhoto:'',
+        vehicleAnglePhoto:'',
+        vehicleRearPhoto: '',
+        otherPhoto:'',
+        licenseType:'',
+        brandModel:'',
+        vinCode:'',
+        plateNumber:'',
+        vehicleFrontLicensePlate:'',
+        registerDate:'',
+        vehicleType:'',
+        boardType:'',
+        emissionStandard:'',
+        areaCode:'',
+        mileage:'',
+        contactNumber:'',
+        minPrice:'',
+        desc:'',
+        underpanBrand: '',
+        brakeSystem: '',
+      },
+      radio: 0,
+      type:'',//1为发布&修改 2为审核
+      id:'',
+      queryType:'',
+      areaList: areaList,
+      areaShow:false,
+      noClick:true,
+      auditRemark:'',
+      auditReason:'',
+      areaName:'',
+      vehicleLicensePhotoList:[],
+      vehicleAnglePhotoList:[],
+      vehicleRearPhotoList: [],
+      otherImgSrcList:[],
+      otherImgSrc:[],
+      status:'',
+      supplierName:'',
+      supplierCode:'',
+    }
+  },
+  async mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.type=this.$route.query.type || urlParams.get('type');
+    this.id=this.$route.query.id ||  urlParams.get('id');
+    this.queryType=this.$route.query.queryType || urlParams.get('queryType');
+    if( this.id){
+      let res = await carInfoDetail({
+        id:this.id,
+        queryType:this.queryType ,
+      })
+      this.form={...res.data}
+      this.form.licenseType=res.data.licenseType?.code
+      this.form.boardType=res.data.boardType?.code
+      this.form.emissionStandard=res.data.emissionStandard?.code
+      this.auditRemark=res.data?.auditRemark
+      this.status=res.data?.status?.code
+      const municipalities = ['北京市', '天津市', '上海市', '重庆市'];
+      const isMunicipality = municipalities.some(city => res.data.areaName.includes(city));
+      this.areaName= isMunicipality ? res.data.areaName?.substring(0, 3) : res.data.areaName;
+      this.supplierName=res.data?.supplierName
+      this.supplierCode=res.data?.supplierCode
+      if(res.data?.otherPhoto){
+        this.otherImgSrc=res.data.otherPhoto?.split(',')
+        this.otherImgSrc?.map(item=>this.otherImgSrcList.push({url:item}))
+      }
+      this.vehicleLicensePhotoList=[{url:res.data?.vehicleLicensePhoto}]
+      this.vehicleAnglePhotoList=[{url:res.data?.vehicleAnglePhoto}]
+      this.vehicleRearPhotoList = [{ url: res.data?.vehicleRearPhoto }]
+    }
+    let carSourceFormInfo=localStorage.getItem("carSourceFormInfo") ? JSON.parse(localStorage.getItem("carSourceFormInfo")) : ''
+    if(!carSourceFormInfo){
+      return
+    }
+    this.form={...carSourceFormInfo.form}
+    this.radio=carSourceFormInfo.radio
+    this.areaName=carSourceFormInfo.areaName
+    if(this.form?.otherPhoto){
+      this.otherImgSrc=this.form.otherPhoto?.split(',')
+      this.otherImgSrc?.map(item=>this.otherImgSrcList.push({url:item}))
+    }
+    if(this.form.vehicleLicensePhoto){
+      this.vehicleLicensePhotoList=[{url:this.form.vehicleLicensePhoto}]
+    }
+   if(this.form.vehicleAnglePhoto){
+     this.vehicleAnglePhotoList=[{url:this.form.vehicleAnglePhoto}]
+   }
+   if( this.form.vehicleRearPhoto ) {
+     this.vehicleRearPhotoList = [{url: this.form.vehicleRearPhoto}]
+   }
+    // console.log("carSourceFormInfo",carSourceFormInfo)
+   if(carSourceFormInfo.otherImgSrc0){
+     this.otherImgSrc.push(carSourceFormInfo.otherImgSrc0)
+     this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc0})
+   }
+    if(carSourceFormInfo.otherImgSrc1){
+      this.otherImgSrc.push(carSourceFormInfo.otherImgSrc1)
+      this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc1})
+    }
+    if(carSourceFormInfo.otherImgSrc2){
+      this.otherImgSrc.push(carSourceFormInfo.otherImgSrc2)
+      this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc2})
+    }
+    if(carSourceFormInfo.otherImgSrc3){
+      this.otherImgSrc.push(carSourceFormInfo.otherImgSrc3)
+      this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc3})
+    }
+    if(carSourceFormInfo.otherImgSrc4){
+      this.otherImgSrc.push(carSourceFormInfo.otherImgSrc4)
+      this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc4})
+    }
+    if(carSourceFormInfo.otherImgSrc5){
+      this.otherImgSrc.push(carSourceFormInfo.otherImgSrc5)
+      this.otherImgSrcList.push({url:carSourceFormInfo.otherImgSrc5})
+    }
+    // console.log("--",this.vehicleLicensePhotoList,this.vehicleAnglePhotoList,this.otherImgSrcList)
+  },
+  methods:{
+    validatePrice(value) {
+      if (value?.startsWith(0) && value?.length > 1) {
+        this.$nextTick(() => {
+          this.form.minPrice = 0
+        })
+      }
+    },
+    clearStorageFormInfo(){
+      localStorage.setItem("carSourceFormInfo",'')
+    },
+    backHandle(){
+      if(this.$route.query.homePage){//返回列表
+        this.$router.push({ name: "indexList"})
+      }else{//返回我的发布
+        this.$router.push({ name: "mineRelease"})
+      }
+      this.clearStorageFormInfo()
+    },
+    viewPrivacy(){
+      let data={
+        form:this.form,radio:this.radio,areaName:this.areaName,
+        otherImgSrc0: this.otherImgSrc[0],
+        otherImgSrc1: this.otherImgSrc[1],
+        otherImgSrc2:this.otherImgSrc[2],
+        otherImgSrc3:this.otherImgSrc[3],
+        otherImgSrc4:this.otherImgSrc[4],
+        otherImgSrc5:this.otherImgSrc[5],
+      }
+      localStorage.setItem("carSourceFormInfo",JSON.stringify(data))
+      this.$router.push({ name: "privacyComponent"})
+    },
+    confirmHandle(val){
+      if(val[0].name.includes('市')){
+        this.areaName=val[0].name
+        this.form.areaCode=val[0].code
+      }else{
+        this.areaName=val[0].name +val[1].name
+        this.form.areaCode=val[1].code
+      }
+      this.areaShow=false
+    },
+    getDrivingLicense(data){
+      console.log("getDrivingLicense",data)
+      this.form.vehicleLicensePhoto=data.url
+      this.form.brandModel=data.info.model
+      this.form.vinCode=data.info.vin
+      this.form.plateNumber=data.info.plateNo
+      this.form.registerDate=data.info.registerDate +' 00:00:00'
+      // this.form.vehicleType=data.info.vehicleType
+    },
+    deleteImg1(){
+      this.form.vehicleLicensePhoto=''
+    },
+    getPlateColor(data){
+      console.log("getPlateColor",data)
+      this.form.vehicleAnglePhoto=data.url
+      this.form.licenseType=data.colorStatus
+      this.form.vehicleFrontLicensePlate=data.plateType
+    },
+    deleteImg2(){
+      this.form.vehicleAnglePhoto=''
+    },
+    getOtherImg(data){
+      this.otherImgSrc.push(data.url)
+    },
+    getBackPhoto(data) {
+      console.log("datadata",data)
+      this.form.vehicleRearPhoto = data.url
+    },
+    deleteImgBack() {
+      this.form.vehicleRearPhoto = '';
+    },
+    handleDeleteOtherImg(file,index) {
+      this.otherImgSrc = this.otherImgSrc.filter((item,i) => index !== i);
+      this.otherImgSrcList = this.otherImgSrcList.filter((item,i) => index !== i);
+    },
+    // 审核操作
+    async auditHandle(type){
+      if (!type && !this.auditReason){
+        this.$toast('请填写不通过原因')
+        return
+      }
+      if (!this.form.vehicleLicensePhoto) {
+        this.$toast('行驶证不能为空')
+        return
+      }
+      if (!this.form.vehicleAnglePhoto) {
+        this.$toast('车辆45度不能为空')
+        return
+      }
+      if(!this.form.vehicleRearPhoto && type == 1) {
+        this.$toast('车辆后方45度不能为空')
+        return
+      }
+      let flag=this.validateHandle()
+      if(flag){
+        this.$toast(flag)
+        return
+      }
+      if (this.form.vehicleType=='平板拖车' && !this.form.boardType) {
+        this.$toast('落板方式不能为空')
+        return
+      }else if(this.form.vehicleType !=='平板拖车'){
+        this.form.boardType=''
+      }
+      let rule
+     if( type == 1 ) {
+       rule = this.validationRules.find(item =>
+         item.value === null ||
+         item.value === undefined ||
+         item.value === ''
+       )
+     } else {
+       rule = this.validationRulesSimple.find(item =>
+         item.value === null ||
+         item.value === undefined ||
+         item.value === ''
+       )
+     }
+
+      if(rule){
+        this.$toast(rule.name)
+        return
+      }
+      try {
+        await auditCarInfo({
+          id: this.id,
+          auditResult: type  ? 1 : 0 ,
+          auditReason: this.auditReason,
+          ...this.form,
+          otherPhoto:this.otherImgSrc?.join(',')
+        })
+        this.clearStorageFormInfo()
+        setTimeout(()=>{
+          this.closeParentDialog()
+        },1000)
+      } finally {
+        console.log(type)
+      }
+    },
+    // 发布车源
+    async submitHandle(){
+      if (!this.radio) {
+        this.$toast('请勾选我已阅读并同意')
+        return
+      }
+      if (!this.form.vehicleLicensePhoto) {
+        this.$toast('行驶证不能为空')
+        return
+      }
+      if (!this.form.vehicleAnglePhoto) {
+        this.$toast('车辆45度不能为空')
+        return
+      }
+      if(!this.form.vehicleRearPhoto) {
+        this.$toast('车辆后方45度不能为空')
+        return
+      }
+      let flag=this.validateHandle()
+      if(flag){
+        this.$toast(flag)
+        return
+      }
+      if (this.form.vehicleType=='平板拖车' && !this.form.boardType) {
+        this.$toast('落板方式不能为空')
+        return
+      }else if(this.form.vehicleType !=='平板拖车'){
+        this.form.boardType=''
+      }
+      let rule = this.validationRules.find(item =>
+          item.value === null ||
+          item.value === undefined ||
+          item.value === ''
+      )
+      if(rule){
+        this.$toast(rule.name)
+        return
+      }
+      try {
+        let res = await publishCarInfo({
+          ...this.form,
+          otherPhoto:this.otherImgSrc?.join(',')
+        })
+        this.clearStorageFormInfo()
+        if(res.code == 200 && !res.msg){
+          this.$toast('发布成功')
+          if(this.isWebFunc()){
+            setTimeout(()=>{
+              this.closeParentDialog()
+            },1000)
+          }else{
+            setTimeout(()=>{
+              this.$router.push({ name: "mineRelease"})
+              sessionStorage.setItem('mineActiveTab',String(1) )
+            },1000)
+          }
+        }else{
+          this.$toast(res.msg)
+        }
+        console.log("车源发布publishCarInfo",res)
+      } catch (e){
+        console.log('e',e)
+      } finally {
+        console.log(111)
+      }
+    },
+    // 手机号验证方法
+    validateHandle() {
+      const contactNumberPattern = /^1[3-9]\d{9}$/; // 手机号正则表达式
+      let str=''
+      if (!this.form.contactNumber) {
+        str='联系方式不能为空'
+        // return
+      } else if (!contactNumberPattern.test(this.form.contactNumber)) {
+        str='联系方式格式错误'
+      } else {
+        str=''
+      }
+      return str
+    },
+  },
+  computed: {
+    validationRules() {
+      return [
+        { value: this.form.vehicleType, name: '车辆类型不能为空' },
+        { value: this.form.emissionStandard, name: '排放标准不能为空' },
+        { value: this.form.brakeSystem, name: '刹车系统不能为空' },
+        { value: this.form.areaCode, name: '所在城市不能为空' },
+        { value: this.form.mileage, name: '行驶里程不能为空' },
+        { value: this.form.contactNumber, name: '联系方式不能为空' },
+        { value: this.form.minPrice, name: '售价不能为空' },
+        { value: this.form.underpanBrand, name: '底盘品牌不能为空' },
+      ];
+    },
+    validationRulesSimple() {
+      return [
+        { value: this.form.vehicleType, name: '车辆类型不能为空' },
+        { value: this.form.emissionStandard, name: '排放标准不能为空' },
+        { value: this.form.areaCode, name: '所在城市不能为空' },
+        { value: this.form.mileage, name: '行驶里程不能为空' },
+        { value: this.form.contactNumber, name: '联系方式不能为空' },
+        { value: this.form.minPrice, name: '售价不能为空' },
+      ];
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+.wrap {
+  @include wh(100%, 100%);
+  position: relative;
+}
+.headerWrap{
+  width: 100%;
+  box-sizing: border-box;
+  padding-top: 15px;
+  padding-bottom: 15px;
+  position: relative;
+  .navWrap{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 16px 10px;
+  }
+  .bg{
+    position: absolute;
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    top: 0;
+    left: 0;
+    opacity: 0.5;
+    z-index: -1;
+  }
+  .back{
+    @include wh(15px,15px);
+  }
+  .navIcon{
+    @include wh(84px,21px);
+  }
+  .audit{
+    @include wh(100%,43px);
+    background: #FFF7F4;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 11px;
+    color: #FF6B3B;
+    .noAudit{
+      @include wh(13px,12px);
+      margin-right: 5px;
+      vertical-align: bottom;
+    }
+    span:first-child{
+      font-weight: 600;
+    }
+  }
+  .supplierInfo{
+    justify-content: space-around;
+    background-color: #F5F7F9;
+    color: #606266;;
+  }
+}
+.navBar{
+  margin-bottom: 46px;
+
+}
+.noContentAudit{
+  height: calc(100% - 42px);
+}
+//100px
+.hasContentAudit{
+  height: calc(100% - 85px);
+}
+.contentWrap{
+  width: 100%;
+  overflow-y: auto;
+  .sort{
+    @include wh(91px, 19px);
+    margin-bottom: 15px;
+  }
+  .line{
+    width: 100%;
+    border-bottom: 1px solid #F2F2F2;
+    margin-top: 26px;
+    margin-bottom: 17px;
+  }
+  .lastLine{
+    margin-top: 3px !important;
+  }
+  .content{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 0 14px 0 20px;
+    //padding:0 20px;
+  }
+  .oneContent{
+    .uploadWrap{
+      display: flex;
+      flex-wrap: wrap;
+      //justify-content: space-between;
+    }
+  }
+  .twoContent{
+    .ocrInfo{
+      background: #FAFBFC;
+      border-radius: 4px;
+    }
+    .item{
+      display: flex;
+      //align-items: center;
+      font-weight: 400;
+      font-size: 13px;
+      color: #2C3D54;
+      line-height: 44px;
+      width: 100%;
+      box-sizing: border-box;
+      padding-left: 21px;
+      padding-right: 9px;
+      span:first-child{
+        display: inline-block;
+        width:70px;
+        font-size: 13px;
+        color: rgba(44, 61, 84, 0.59);
+      }
+      span:last-child{
+        display: inline-block;
+        width:calc(100% - 70px);
+        border-bottom: 1px solid #E9E9EA;
+      }
+      .orc{
+        box-sizing: border-box;
+        padding-left: 6px;
+      }
+    }
+    .vehicleTypeItem{
+      line-height: 13px !important;
+      margin-top: 8px;
+    }
+    .star{
+      color: #FF4B4B !important;
+      opacity: 1 !important;
+      font-weight: bold;
+      font-size: 12px;
+      margin-right: 6px;
+      margin-left: -6px;
+    }
+    .radioWrap{
+      width:calc(100% - 70px);
+      border-bottom: 1px solid #E9E9EA;
+    }
+  }
+  .threeContent{
+    .checkedWrap{
+      cursor: pointer;
+      color:#808D99 ;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 20px;
+      margin-bottom: 10px;
+      font-size: 12px;
+      .radioIcon{
+        @include wh(16px, 16px);
+        margin-right: 6px;
+      }
+      span:last-child{
+        color: #0E76F4;
+      }
+    }
+    .btnWrap{
+      padding-bottom: 20px;
+      padding-top: 15px;
+    }
+    .commonBtn{
+      height: 46px;
+      line-height: 46px;
+      text-align: center;
+      font-weight: bold;
+      border-radius: 5px;
+      color: #FFFFFF;
+      cursor: pointer;
+    }
+    .btn{
+      width: 296px;
+      background: #4A7FEB;
+      margin: 0 auto;
+      font-size: 15px;
+    }
+    .auditBtn{
+      display: flex;
+      justify-content: space-between;
+      font-size: 14px;
+      box-sizing: border-box;
+      padding: 0 6px;
+      div:first-child{
+        width: 100px;
+        opacity: 0.79;
+        background: #1C2C49;
+      }
+      div:last-child{
+        width: 200px;
+        background: #4A7FEB;
+      }
+    }
+  }
+}
+ ::v-deep .van-icon-success{
+  display: none !important;
+}
+ ::v-deep .van-radio__label{
+   margin-left: 0;
+   width: 54px;
+   height: 23px;
+   border-radius: 13px;
+   border: 1px solid #9F9F9F;
+   opacity: 0.5;
+   text-align: center;
+   line-height: 23px;
+   font-size: 12px;
+   color: #323233;
+   opacity: 1;
+ }
+ ::v-deep .van-radio--horizontal{
+   margin-right: 4px;
+ }
+::v-deep .van-radio--horizontal:last-child{
+  margin-right: 0;
+}
+::v-deep  .checked .van-radio__label{
+   background: #FFF1EC !important;
+   border: 1px solid #FF5C26 !important;
+   color: #FE5006 !important;
+   border-radius: 13px !important;
+ }
+::v-deep  .van-field__right-icon{
+  margin-right: 0;
+  padding: 0;
+}
+::v-deep .ipt .el-textarea__inner{
+  background: #F5F7F9;
+  border-radius: 4px;
+  //opacity: 0.74;
+  font-size: 12px;
+  border: none;
+}
+::v-deep .van-popup__close-icon--top-right{
+  display: none;
+}
+::v-deep .vehicleRadio .van-radio__label{
+  margin-bottom: 8px !important;
+}
+</style>
--- a/src/views/secondHandCar/components/upload-common.vue
+++ b/src/views/secondHandCar/components/upload-common.vue
@ -0,0 +1,260 @@
+<template>
+  <van-uploader
+      v-model="filesList"
+      :after-read="handleFileRead"
+      :before-delete="deleteHandle"
+      :preview-size="103"
+      accept="image "
+      :preview-full-image="false"
+      :max-count="multiple ? 6 : 1"
+      @click-preview="handlePreviewClick"
+  >
+    <div class="upload">
+      <img class="icon" src="@/assets/secondHandCar/upload.png"/>
+      <span class="text">{{ displayText }}</span>
+    </div>
+    <template v-if="text.includes('其他照片')" #preview-cover="{ index }">
+      <div class="preview-cover van-ellipsis">{{ index + 1 }}/6</div>
+    </template>
+  </van-uploader>
+</template>
+
+<script>
+import { ImagePreview } from 'vant';
+import {unifiedOCRWithCompress, uploadImage} from "@/api/mine";
+export default {
+  name: "uploadCommon",
+  props: {
+    text: {
+      type: String,
+      default: ''
+    },
+    multiple: {
+      type: Boolean,
+      default: false
+    },
+    files: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      filesList: [],
+    }
+  },
+  watch: {
+    files: {
+      immediate: true,
+      deep:true,
+      handler(newVal) {
+        this.$nextTick(() => {
+          this.filesList = newVal || [];
+        })
+      },
+    },
+    filesList: {
+      handler(newVal) {
+        this.$emit("update:files", newVal);
+      },
+      deep: true,
+    },
+  },
+  computed: {
+    displayText() {
+      if (this.text === "其他照片0/6") {
+        return `其他照片 ${this.filesList.length}/${this.multiple ? 6 : 1}`;
+      }
+      return this.text;
+    },
+  },
+  methods: {
+    // 点击预览图片时触发
+    handlePreviewClick(file, detail) {
+      this.showFullScreenPreview(file.url || file.content,detail);
+    },
+    // 全屏预览
+    showFullScreenPreview(imageUrl,detail) {
+      const images = this.filesList.map(file => file.url || file.content); // 所有图片的 URL
+      ImagePreview({
+        images,
+        startPosition: detail.index,
+        closeable: true,
+        onClose: () => {}
+      });
+    },
+    async deleteHandle(file, detail) {
+      this.filesList = this.filesList.filter((item, i) => i !== detail.index);
+      if (this.text === "行驶证照片") {
+        this.$emit("delete1");
+      } else if (this.text === "车辆45度照") {
+        this.$emit("delete2");
+      } else if(this.text == '车辆后方45度') {
+        this.$emit("delete4");
+      } else {
+        console.log("file, detail", file, detail)
+        this.$emit("delete3", file, detail.index);
+      }
+      return true;
+    },
+    async handleFileRead(file) {
+      const formData = new FormData();
+      if(!file.file){
+        this.$toast('获取文件失败，请重新上传')
+      }
+      formData.append("file", file.file);
+      let res = await uploadImage(formData);
+      // 为文件添加唯一标识符
+      file.uid = Date.now(); // 使用时间戳作为唯一标识符
+      if (this.text == '行驶证照片') {
+        // 行驶证识别
+        let result = await unifiedOCRWithCompress({
+          ocrType: 3,
+          imageUrl: res.data,
+          cardSide: 'FRONT'
+        });
+        let data = {url: res?.data, info: {...result?.data?.frontInfo}}
+        this.$emit('success1', data)
+      } else if (this.text == '车辆45度照') {
+        let result = await unifiedOCRWithCompress({
+          ocrType: 10,
+          imageUrl: res.data,
+          cardSide: 'FRONT'
+        });
+        let num = this.getVehicleLicense(result.data.color)
+        let data = {url: res?.data, colorStr: result.data.color, colorStatus: num, plateType: result.data.number}
+        this.$emit('success2', data)
+      } else if(this.text == '车辆后方45度') {
+        this.$emit('success4', {url: res?.data, uid: file.uid})
+      } else {
+        this.$emit('success3', {url: res?.data, uid: file.uid})
+      }
+    },
+    getVehicleLicense(color) {
+      let vehicleLicense = ''
+      if (color == '蓝') {
+        vehicleLicense = 1
+      } else if (color == '黄') {
+        vehicleLicense = 2
+      } else if (color == '临牌') {
+        vehicleLicense = 4
+      } else if (color.includes('绿')) {
+        vehicleLicense = 3
+      } else {
+        vehicleLicense = 5
+      }
+      return vehicleLicense
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.preview-image {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  cursor: pointer; /* 鼠标悬停时显示手型 */
+}
+.custom-preview {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.8);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  z-index: 9999;
+}
+
+.custom-preview img {
+  max-width: 90%;
+  max-height: 90%;
+}
+
+.close-icon {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+  color: #fff;
+  font-size: 24px;
+  cursor: pointer;
+}
+.preview-cover {
+  position: absolute;
+  bottom: 0;
+  box-sizing: border-box;
+  width: 100%;
+  padding: 4px;
+  color: #fff;
+  font-size: 12px;
+  text-align: center;
+  background: rgba(0, 0, 0, 0.3);
+}
+
+::v-deep .van-uploader {
+  margin-bottom: 5px;
+}
+
+.upload {
+  position: relative;
+  width: 103px;
+  height: 70px;
+  background: #F1F6FF;
+  box-shadow: 0px 0px 2px 0px rgba(235, 235, 235, 0.38);
+  border-radius: 4px;
+  border: 1px solid #B8CBE9;
+  display: flex;
+  flex-direction: column;
+  flex-wrap: wrap;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding-top: 14px;
+  padding-bottom: 3px;
+
+  .icon {
+    width: 30px;
+    height: 30px;
+  }
+
+  .text {
+    width: 80px;
+    background: #5A6FFF;
+    border-radius: 7px;
+    opacity: 0.9;
+    text-align: center;
+    font-weight: 600;
+    font-size: 11px;
+    color: #FFFFFF;
+  }
+}
+
+::v-deep .van-uploader__preview {
+  margin: 0 4px 4px 0;
+}
+
+::v-deep .van-uploader__input-wrapper {
+  margin: 0 4px 4px 0;
+}
+
+::v-deep .van-uploader__preview-image {
+  height: 70px !important;
+  border-radius: 4px !important;
+}
+
+::v-deep .van-uploader__preview-delete {
+  background-image: url('@/assets/secondHandCar/delete.png'); /* 替换为你的图片路径 */
+  background-size: cover;
+  background-color: transparent;
+  border: none;
+  width: 15px;
+  height: 15px;
+}
+
+::v-deep .van-uploader__preview-delete-icon {
+  display: none !important; /* 强制隐藏伪元素 */
+}
+</style>
--- a/src/views/secondHandCar/forSale.vue
+++ b/src/views/secondHandCar/forSale.vue
@ -0,0 +1,402 @@
+<template>
+  <div class="wrap" >
+    <div class="headerWrap">
+      <div v-if="isWebFunc()" style="opacity: 0;" class="back"></div>
+      <img v-else class="back" @click="h5GoBack" src="@/assets/secondHandCar/back.png" />
+      <span>在售</span>
+      <div style="opacity: 0;" class="back"></div>
+    </div>
+    <van-loading v-show="!detailInfo"  class="loadingWrap"  type="spinner" color="#1989fa" />
+    <div class="contentWrap" v-show="detailInfo">
+      <el-carousel v-if="isWebFunc()" trigger="click" height="215px" :autoplay="true">
+        <el-carousel-item v-for="(item,i) in imgSrcList" :key="i">
+          <el-image
+            :src="item"
+            v-if="item"
+            :preview-src-list="[item]"
+            class="swipeImg"
+          />
+<!--          <img v-if="item" class="swipeImg" :src="item" />-->
+        </el-carousel-item>
+      </el-carousel>
+      <van-swipe v-else  @change="onChange" :autoplay="3000">
+        <van-swipe-item v-for="(item,i) in imgSrcList" :key="i" @click="showImagePreview(i)">
+          <img v-if="item" class="swipeImg" :src="item" />
+        </van-swipe-item>
+        <template #indicator>
+          <div class="custom-indicator">{{ current + 1 }}/{{imgSrcList.length}}</div>
+        </template>
+      </van-swipe>
+      <div class="infoWrap">
+        <div class="titleWrap wrapCommon">
+          <div class="info">
+            <span>{{ detailInfo.vehicleType }}</span>
+            <span>{{ detailInfo.boardType?.label }}</span>
+            <span>{{ detailInfo.licenseType?.label }}</span>
+            <span>{{detailInfo.brandModel?.match(/^[\u4e00-\u9fa5]+/)?.[0]?.replace(/牌$/, '')}}</span>
+            <span>{{  formatToWan(detailInfo.mileage) }}公里</span>
+            <span>{{ detailInfo.emissionStandard?.label }}</span>
+          </div>
+          <div class="time">
+            <span>{{ detailInfo.createTime?.substring(0,10) }}</span><span>{{ detailInfo.areaName }}</span><span>发布</span>
+          </div>
+          <div class="price">
+            售价（含税）：
+            <span>{{ formatNumber(detailInfo.minPrice) }}</span>
+            <span>万</span>
+          </div>
+        </div>
+        <div class="detailInfoWrap wrapCommon">
+          <div>
+            <img class="descImg firstDescImg" src="@/assets/secondHandCar/details.png" />
+          </div>
+          <div class="descItem descCommon">
+            <div class="itemInfo">
+              <span>{{ detailInfo.licenseType?.label }}</span>
+              <span>牌照类型</span>
+            </div>
+            <div class="suGang"></div>
+            <div class="itemInfo">
+              <span>{{ detailInfo.vehicleType }}</span>
+              <span>车辆类型</span>
+            </div>
+            <div class="suGang"></div>
+            <div class="itemInfo">
+              <span>{{ detailInfo.boardType?.label }}&nbsp;&nbsp;</span>
+              <span>落板方式</span>
+            </div>
+          </div>
+          <div class="descItem descCommon">
+            <div class="itemInfo">
+              <span>{{detailInfo.brandModel?.match(/^[\u4e00-\u9fa5]+/)?.[0]?.replace(/牌$/, '')}}</span>
+              <span>上装品牌</span>
+            </div>
+            <div class="suGang"></div>
+            <div class="itemInfo">
+              <span>{{ detailInfo.emissionStandard?.label }}</span>
+              <span>排放标准</span>
+            </div>
+            <div class="suGang"></div>
+            <div class="itemInfo">
+              <el-tooltip  class="item" effect="dark" :content="formatToWan(detailInfo.mileage)+'公里'" placement="top">
+                <span style="display: inline-block;width:100%;cursor: pointer; white-space: nowrap; overflow: hidden;  text-overflow: ellipsis;">{{ formatToWan(detailInfo.mileage)}}公里</span>
+              </el-tooltip>
+              <span>行驶公里</span>
+            </div>
+          </div>
+          <div class="descItem descCommon">
+            <div class="itemInfo dateItemInfo">
+              <span>{{ detailInfo.registerDate?.substring(0,10) }}</span>
+              <span>注册日期</span>
+            </div>
+          </div>
+          <div>
+            <img class="descImg"  src="@/assets/secondHandCar/description1.png" />
+          </div>
+          <div class="descCommon desc">{{detailInfo.desc}}</div>
+        </div>
+        <div class="btnWrap" >
+          <div v-if="isList && !detailInfo.selfSupplierPublish" class="btn commonBtn"  @click="noMultipleClicks(handle)">我想要</div>
+        </div>
+      </div>
+    </div>
+ </div>
+</template>
+
+<script>
+
+import {myMixins} from "@/utils/myMixins"
+import {carInfoDetail,saveRecord} from "@/api/secondHandCar";
+import { ImagePreview, Dialog } from 'vant';
+export default {
+  name: "forSale",
+  mixins:[myMixins],
+  data(){
+    return{
+      current: 0,
+      noClick:true,
+      id:'',
+      queryType:'',
+      detailInfo:'',
+      imgSrcList:[],
+      duration:'',
+      startTime: null, // 记录进入时间
+      recordType:1,
+      isList:false,//是否是首页列表跳转过来的
+    }
+  },
+  async mounted() {
+    window.addEventListener('message', (event) => {
+      if (event.data === 'dialogClosed') {
+        console.log('Dialog 已关闭');
+        this.getDuration(1)
+        // 执行关闭后的逻辑
+      }
+    });
+    this.startTime = new Date();
+    const urlParams = new URLSearchParams(window.location.search);
+    this.id=this.$route.query.id ||  urlParams.get('id');
+    this.queryType=this.$route.query.queryType || urlParams.get('queryType');
+    this.isList=this.$route.query.isList || urlParams.get('isList');
+    if( this.id){
+      let res = await carInfoDetail({
+        id:this.id,
+        queryType:this.queryType ,
+      })
+      this.detailInfo=res?.data
+      const municipalities = ['北京市', '天津市', '上海市', '重庆市'];
+      const isMunicipality = municipalities.some(city => res.data.areaName.includes(city));
+      this.detailInfo.areaName= isMunicipality ? res.data.areaName?.substring(0, 3) : res.data.areaName;
+      if(res.data.otherPhoto){
+        this.imgSrcList=res.data.otherPhoto.split(',') || []
+      }
+      if( res?.data?.vehicleRearPhoto ) {
+        this.imgSrcList.unshift(res?.data?.vehicleRearPhoto)
+      }
+      this.imgSrcList.unshift(res?.data?.vehicleAnglePhoto)
+    }
+  },
+  destroyed() {
+    this.getDuration(1)
+  },
+  methods:{
+    showImagePreview(index) {
+      ImagePreview({
+        images: this.imgSrcList.map(item => item),
+        startPosition: index,
+        closeable: true
+      });
+    },
+    formatToWan(num) {
+      let result = (num / 10000).toString(); // 转换为万单位
+      if (result.includes('.')) {
+        let decimalPart = result.split('.')[1]; // 获取小数部分
+        if (decimalPart.length > 1) {
+          result = parseFloat(result).toFixed(1); // 保留一位小数
+        }
+      }
+      return result + '万';
+    },
+    getDuration(type){
+      // 页面卸载时记录离开时间并计算浏览时长
+      const endTime = new Date();
+      const duration = (endTime - this.startTime) / 1000; // 计算时长（秒）\
+      this.saveRecord(duration,type);
+    },
+    async saveRecord(duration,type){
+      await saveRecord({type: type, carInfoId: this.id, duration})
+    },
+    handle(){
+      this.getDuration(2)
+      Dialog.alert({
+        message:this.detailInfo.contactNumber	,
+        confirmButtonText:'拨打电话',
+        showCancelButton:true,
+      }).then(async() => {
+        window.location.href = `tel:${this.detailInfo.contactNumber}`;
+      }).catch(() => {
+        // on cancel
+      });
+    },
+    onChange(index) {
+      this.current = index;
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+.wrap {
+  @include wh(100%, 100%);
+  position: relative;
+  background-color: #F6F6F6;
+}
+.headerWrap{
+  width: 100%;
+  box-sizing: border-box;
+  padding: 15px 16px;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  .back{
+    @include wh(15px,15px);
+  }
+  span{
+    font-weight: bold;
+    font-size: 16px;
+    color: #203152;
+  }
+}
+.loadingWrap{
+  width: 100%;
+  height: calc(100% - 42px);
+  text-align: center;
+  line-height: 200px;
+}
+.contentWrap{
+  height: calc(100% - 42px);
+  overflow-y: auto;
+  .infoWrap{
+    box-sizing: border-box;
+    padding: 0 6px;
+    margin-top: -15px;
+    position: relative;
+    z-index: 111;
+  }
+  .wrapCommon{
+    width: 100%;
+    background: #FFFFFF;
+    border-radius: 6px;
+    backdrop-filter: blur(5.602678571428572px);
+    box-sizing: border-box;
+    margin-bottom: 12px;
+  }
+  .titleWrap{
+    height: 108px;
+    padding: 18px 0 15px 21px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    .info{
+      font-weight: 600;
+      font-size: 15px;
+      color: #212020;
+      line-height: 21px;
+      span{
+        margin-right: 10px;
+      }
+    }
+    .time{
+      font-weight: 400;
+      font-size: 12px;
+      color: #999999;
+      line-height: 17px;
+      span:first-child{
+        margin-right: 20px;
+      }
+      span:last-child{
+        margin-left: 10px;
+      }
+    }
+    .price{
+      color: #FF5533;
+      line-height: 28px;
+      font-weight: 600;
+      span:first-child{
+        font-size: 20px;
+        margin-right: 4px;
+      }
+      span:last-child{
+        font-size: 11px;
+      }
+    }
+  }
+  .detailInfoWrap{
+    box-sizing: border-box;
+    padding: 18px 28px 15px 22px;
+    .descImg{
+      @include wh(72px, 19px);
+    }
+    .firstDescImg{
+      margin-bottom: 24px;
+    }
+    .descCommon{
+      width: 100%;
+      box-sizing: border-box;
+      padding-left: 15px;
+    }
+    .descItem{
+      display: flex;
+      justify-content: space-between;
+      align-items: baseline;
+      margin-bottom: 20px;
+    }
+    .dateItemInfo{
+      width: 40% !important;
+    }
+    .itemInfo{
+      display: flex;
+      flex-direction: column;
+      width: 23%;
+      span:first-child{
+        font-weight: bold;
+        font-size: 14px;
+        color: #282828;
+        line-height: 20px;
+        margin-bottom: 2px;
+      }
+      span:last-child{
+        font-weight: 400;
+        font-size: 10px;
+        color: #999999;
+        line-height: 14px;
+      }
+    }
+    .suGang{
+      width: 1px;
+      height: 8px;
+      border-right: 1px solid #999999;
+      opacity: 0.5;
+    }
+    .desc{
+      font-weight: 400;
+      font-size: 12px;
+      color: #282828;
+      margin-top: 10px;
+    }
+  }
+  .btnWrap{
+    padding-bottom: 20px;
+  }
+  .commonBtn{
+    height: 46px;
+    line-height: 46px;
+    text-align: center;
+    font-weight: bold;
+    border-radius: 5px;
+    color: #FFFFFF;
+    cursor: pointer;
+  }
+  .btn{
+    width: 296px;
+    background: #4A7FEB;
+    margin: 0 auto;
+    font-size: 15px;
+  }
+}
+.custom-indicator {
+  position: absolute;
+  right: 5px;
+  bottom: 20px;
+  padding: 2px 5px;
+  font-size: 12px;
+  background: rgba(0, 0, 0, 0.1);
+  color: wheat;
+}
+.van-swipe-item{
+  height: 215px;
+  background-color: pink;
+}
+.swipeImg{
+  width: 100%;
+  height: 100%;
+  object-fit: cover; /* 保持比例填充容器，裁剪多余部分 */
+  object-position: center; /* 居中显示 */
+}
+  ::v-deep .el-carousel__button {
+    height: 0.15rem !important;
+    width: 0.3rem;
+  }
+  ::v-deep .el-carousel__indicators--horizontal {
+    padding: 0.32rem 0.08rem;
+  }
+  ::v-deep .el-carousel__arrow {
+    background-color: rgba(31, 45, 61, 1);
+    font-size: 0.5rem;
+  }
+  ::v-deep .el-carousel__indicators--horizontal {
+    bottom: 10px;
+  }
+</style>
--- a/src/views/secondHandCar/indexList.vue
+++ b/src/views/secondHandCar/indexList.vue
@ -0,0 +1,684 @@
+<template>
+  <div class="wrap">
+    <div class="navBar">
+      <van-nav-bar
+          title="二手车信息"
+          left-arrow
+          left-arrow-color="#FFFFFF"
+          :border="false"
+          :fixed="true"
+          :safe-area-inset-top="true"
+          @click-left="goBack"
+      />
+    </div>
+    <div class="headerWrap">
+      <img class="bg" src="@/assets/secondHandCar/bg.png" />
+      <img class="mine" src="@/assets/secondHandCar/mine.png" @click="goMine" />
+      <el-input
+          @blur="getList"
+          placeholder="请输入"
+          v-model.trim="topSearch">
+        <img slot="suffix" class="search" src="@/assets/secondHandCar/search.png"/>
+      </el-input>
+    </div>
+    <div class="firstTab">
+      <div>
+        <img class="big com" v-show="activeTab === 0"  src="@/assets/secondHandCar/cheyuanBig.png" @click="tabClick(0)" />
+        <img class="small com" v-show="activeTab === 1" src="@/assets/secondHandCar/cheyuanSmall.png" @click="tabClick(0)"/>
+        <img class="big" v-show="activeTab === 1" src="@/assets/secondHandCar/qiugouBig.png" @click="tabClick(1)"/>
+        <img class="small" v-show="activeTab === 0" src="@/assets/secondHandCar/qiugouSmall.png" @click="tabClick(1)"/>
+      </div>
+      <div @click="poupShow = true">
+        <img class="suggest" src="@/assets/secondHandCar/suggest.png" />
+      </div>
+    </div>
+    <div class="filterWrap">
+      <el-select  v-model="licenseType" placeholder="牌照类型" :class="{'customSel':true , 'has-value': licenseType }" clearable>
+        <el-option
+            v-for="item in licenseTypeOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+        </el-option>
+      </el-select>
+      <el-select  v-model="vehicleType" placeholder="车辆类型" :class="{'customSel':true , 'has-value': vehicleType }" clearable>
+        <el-option
+            v-for="item in vehicleTypeOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.label">
+        </el-option>
+      </el-select>
+      <div class="customSel priceSel" @click.stop="changePrice">
+        <span :class="{'has-price': priceSort }">价格</span>
+        <span class="iconSpan">
+          <van-icon :class="{'has-price': priceSort==1 ,'icon':true}" name="arrow-up"  />
+          <van-icon :class="{'has-price': priceSort==2 ,'icon':true}" name="arrow-down"  />
+        </span>
+        <span v-show="priceSort"><van-icon @click.stop="clearPrice" :class="{'has-price': priceSort ,'icon':true}" name="close"  /></span>
+      </div>
+      <el-select v-model="emissionStandard" placeholder="排放标准" :class="{'customSel':true , 'has-value': emissionStandard }" clearable>
+        <el-option
+            v-for="item in emissionStandardOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+        </el-option>
+      </el-select>
+      <el-select v-model="boardType" placeholder="落板方式" :class="{'customSel':true , 'has-value': boardType }" clearable>
+        <el-option
+            v-for="item in boardTypeOption"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value">
+        </el-option>
+      </el-select>
+      <el-select v-model="proprietary" placeholder="发布方" :class="{'customSel':true , 'has-value': (proprietary || proprietary === 0) ? true : false }" clearable>
+        <el-option
+          v-for="item in proprietaryOption"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+        </el-option>
+      </el-select>
+    </div>
+    <div class="contentWrap" v-show="!show">
+      <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
+        <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="onLoad"
+        >
+          <div class="contentItem">
+            <div class="item" v-for="(item,index) in pageList" :key="index" @click="viewCarSource(item)">
+              <div class="left">
+                <img class="owner_logo" v-if="item.proprietary == 1" src="@/assets/secondHandCar/icon_zdOwner.png" alt="">
+                <img class="saled_logo" v-if="item.status.code == 6 && item.downReason == '已售出'" src="@/assets/secondHandCar/icon_saled.png" alt="">
+                <img class="img" v-if="item.vehicleAnglePhoto"  :src="item.vehicleAnglePhoto" />
+                <div v-else class="qiugou">{{item.vehicleType?.substring(0,2)}}</div>
+              </div>
+              <div class="right">
+                <div class="title">{{item.vehicleType}}</div>
+                <div v-if="activeTab==0" class="type">{{ item.boardType?.label ? item.boardType?.label+' | ' : ''}}  {{ item.licenseType?.label }} |
+                  {{ item.brandModel?.match(/^[\u4e00-\u9fa5]+/)?.[0]?.replace(/牌$/, '') }} | {{item.emissionStandard?.label}} | {{ formatToWan(item.mileage) }}公里</div>
+                <div v-else class="type">{{ item.boardType?.label ? item.boardType?.label+' | ' : ''}} {{item.emissionStandard?.label}}</div>
+                <div class="date" v-show="activeTab==0 && item.registerDate">注册日期： {{item.registerDate?.substring(0,10)}}</div>
+                <div v-if="activeTab==0" class="price">售价（含税）：<span>￥</span> <span>{{formatNumber(item.minPrice) }}</span> <span>万</span> </div>
+                <div v-else class="priceRange">
+                  售价（含税）：
+                  <span class="num">{{formatNumber(item.minPrice) }}</span> <span  class="danwei">万</span>
+                  <span class="su">~</span>
+                  <span class="num">{{formatNumber(item.maxPrice) }}</span> <span  class="danwei">万</span>
+                </div>
+                <div class="line"></div>
+              </div>
+            </div>
+          </div>
+        </van-list>
+      </van-pull-refresh>
+    </div>
+    <div class="empty" v-show="show">
+      <img src="@/assets/empty.png" />
+    </div>
+    <img v-show="activeTab==0" @click="releaseHandle(1)" class="fixImg" src="@/assets/secondHandCar/sellCar.png" />
+    <img v-show="activeTab==1" @click="releaseHandle(2)" class="fixImg" src="@/assets/secondHandCar/buyCar.png" />
+    <van-popup v-model="poupShow" closeable round  :style="{ width: '90%' }"  class="poupWrap">
+        <span class="title">反馈建议</span>
+        <div class="poupContent">
+          <div class="tip">如有任何建议，请及时反馈我们。</div>
+          <el-input class="ipt" v-model.trim="suggestContent" type="textarea"  :autosize="{ minRows: 6, maxRows: 10 }"
+                    maxlength="500" show-word-limit></el-input>
+          <div class="btnWrap">
+            <div class="btn" @click="submitSuggest">提交</div>
+          </div>
+      </div>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+import {appPageList,userFeedback } from "@/api/secondHandCar"
+export default {
+  name: "indexList",
+  mixins:[myMixins],
+  watch:{
+  /*  topSearch(){
+      this.setSearchVal();
+      this.getList()
+    },*/
+    licenseType(){
+      this.setSearchVal();
+      this.getList()
+    },
+    vehicleType(){
+      this.setSearchVal();
+      this.getList()
+    },
+    emissionStandard(){
+      this.setSearchVal();
+      this.getList()
+    },
+    boardType(){
+      this.setSearchVal();
+      this.getList()
+    },
+    proprietary() {
+      this.setSearchVal();
+      this.getList()
+    }
+  },
+  data(){
+    return{
+      pageList:[],
+      topSearch:'',
+      activeTab:0,
+      isLoading:"",
+      loading: false,
+      finished: false,
+      pageNum:1,
+      pageSize:10,
+      total:'',
+      licenseType:'',
+      vehicleType:'',
+      priceSort:'',
+      emissionStandard:'',
+      boardType:'',
+      proprietary: '',
+      licenseTypeOption:[
+        {value:2,label:'黄牌'},{value:3,label:'绿牌'},{value:1,label:'蓝牌'},
+      ],
+      vehicleTypeOption:[
+        {value:1,label:'拖车'},{value:2,label:'地库车'},{value:3,label:'牵引车'},{value:4,label:'随车吊'},{value:5,label:'其他'},
+      ],
+      priceOption:[
+        {value:1,label:'5~6'},{value:2,label:'7~8'},{value:3,label:'8~9'}
+      ],
+      emissionStandardOption:[
+        {value:1,label:'不限'},{value:3,label:'国三'},{value:4,label:'国四'},{value:5,label:'国五'},{value:6,label:'国六'}
+      ],
+      boardTypeOption:[
+        {value:1,label:'全落地'},{value:2,label:'斜落一体'},{value:3,label:'普通斜板'},{value:9,label:'不限'}
+      ],
+      proprietaryOption: [{value: 1, label: '中道自营'}, {value: 0, label: '服务商发布'}],
+      poupShow:false,
+      suggestContent:'',
+    }
+  },
+  mounted() {
+    this.getSearchVal();
+    this.getList();
+    document.addEventListener('visibilitychange', async (  ) => {
+      let state = document.visibilityState
+      if (state == 'hidden') {  // 用户离开了
+      }
+      if (state == 'visible') {
+        console.log('visible')
+      }
+    });
+  },
+
+  methods:{
+    formatToWan(num) {
+      let result = (num / 10000).toString();
+      if (result.includes('.')) {
+        let decimalPart = result.split('.')[1];
+        if (decimalPart.length > 1) {
+          result = parseFloat(result).toFixed(1);
+        }
+      }
+      return result + '万';
+    },
+    async tabClick(type){
+      this.activeTab=type
+      this.pageNum = 1
+      this.pageList = [];
+      this.total=0
+      await this.setSearchVal();
+      await this.getList()
+    },
+    async onLoad(){
+      this.pageNum++;
+      await this.getList()
+      this.loading = false;
+      if (this.pageList.length >= this.total) {
+        this.finished = true;
+      }
+    },
+    changePrice(){
+      if(!this.priceSort){
+        this.priceSort=1
+      }
+      if( this.priceSort==1){
+        this.priceSort=2
+      }else{
+        this.priceSort=1
+      }
+      this.getList();
+    },
+    clearPrice(){
+      this.priceSort=''
+      this.setSearchVal()
+      this.getList();
+    },
+    setSearchVal(){
+      sessionStorage.setItem('indexActiveTab',String(this.activeTab) );
+      sessionStorage.setItem('topSearch',this.topSearch);
+      sessionStorage.setItem('vehicleType',this.vehicleType);
+      sessionStorage.setItem('priceSort',this.priceSort);
+      sessionStorage.setItem('indexActiveTab',String(this.activeTab) );
+      sessionStorage.setItem('licenseType',String(this.licenseType));
+      sessionStorage.setItem('emissionStandard',String(this.emissionStandard));
+      sessionStorage.setItem('boardType',String(this.boardType));
+      sessionStorage.setItem('proprietary',String(this.proprietary));
+    },
+    getSearchVal(){
+      this.activeTab = Number(sessionStorage.getItem('indexActiveTab')) || 0;
+      this.topSearch = sessionStorage.getItem('topSearch') || '';
+      this.vehicleType = sessionStorage.getItem('vehicleType') || '';
+      this.priceSort = Number(sessionStorage.getItem('priceSort')) || '';
+      this.licenseType = Number(sessionStorage.getItem('licenseType')) || '';
+      this.emissionStandard = Number(sessionStorage.getItem('emissionStandard')) || '';
+      this.boardType = Number(sessionStorage.getItem('boardType')) || '';
+      this.proprietary = Number(sessionStorage.getItem('proprietary')) || '';
+    },
+    goMine(){//我的发布
+      this.$router.push({ name: "mineRelease"})
+      sessionStorage.setItem('mineActiveTab',String(1) )
+    },
+    viewCarSource(item){
+      if(this.activeTab===0){//车源查看
+        this.$router.push({ name: "forSale", query: {type:1 , id:item.id,queryType:1,isList:true }})
+      }else{//求购查看
+        this.$router.push({ name: "wantBuySale", query: { type:1 ,id:item.id ,queryType:2,isList:true}})
+      }
+      this.setSearchVal();
+    },
+    releaseHandle(type){
+      if(type===1){//车源发布
+         this.$router.push({
+          name: "carSource",
+          query: { type:1,homePage:true }
+         })
+      }else{//求购发布
+        this.$router.push({ name: "wantBuy", query: { type:1,homePage:true }  })
+      }
+      this.setSearchVal();
+    },
+    async submitSuggest(){
+      if(!this.suggestContent){
+        this.$toast('反馈提交不能为空')
+        return
+      }
+      //继续提交
+      await userFeedback ({
+        content:this.suggestContent,
+      })
+      this.poupShow=false
+      this.suggestContent=''
+      this.$toast('反馈建议提交成功')
+    },
+    onRefresh() {
+      this.pageNum=1
+      this.getList()
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+
+    async getList(){
+      let res= await appPageList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        type:this.activeTab==0 ? 1 : 2,
+        topSearch:this.topSearch,
+        licenseType:this.licenseType,
+        vehicleType:this.vehicleType,
+        priceSort:this.priceSort,
+        boardType:this.boardType,
+        emissionStandard:this.emissionStandard,
+        proprietary: this.proprietary
+      })
+      this.total=res.total
+      if(this.pageNum == 1){// 第一页直接赋值
+        this.pageList=res.data
+      }else{// 第二页数据拼接
+        let preList = this.pageList;
+        let arr = res.data;
+        this.pageList = preList.concat(arr)
+      }
+    },
+    goApp(){
+      let data = {"action":"goBack","params":""}
+      var u = navigator.userAgent;
+      var isiOS = !!u.match(/\(i[^;]+;( U;)? CPU.+Mac OS X/);
+      if(isiOS){
+        window.webkit.messageHandlers.nativeObject.postMessage(data);
+      }else {
+        window.android.sendMessage("goBack");
+      }
+    },
+  },
+  computed:{
+    show() {
+      return (this.pageList.length < 0 || this.pageList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+}
+</script>
+<style scoped lang="scss">
+@import "@/styles/common.scss";
+@import "@/styles/mixin.scss";
+.wrap{
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+.navBar{
+  margin-bottom: 46px;
+}
+.fixImg{
+  width: 210px;
+  height: 102px;
+  position: fixed;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 11;
+  cursor: pointer;
+}
+.headerWrap{
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  box-sizing: border-box;
+  padding-left: 15px;
+  padding-right: 10px;
+  padding-top: 10px;
+  position: relative;
+  .bg{
+    position: absolute;
+    width: 100%;
+    height: 144px;
+    top: 0;
+    left: 0;
+    z-index: -1;
+  }
+  .mine{
+    width: 55px;
+    height: 43px;
+    margin-right: 15px;
+  }
+  .search{
+    width: 17px;
+    height: 17px;
+  }
+  ::v-deep .el-input__inner{
+    background: rgba(255,255,255,0.8);
+    border-radius: 20px;
+    border: 2px solid #264B94;
+  }
+  ::v-deep .el-input__suffix{
+    top: 12px;
+    right: 10px;
+  }
+}
+.firstTab{
+  width: 100%;
+  padding-top: 18px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  img{
+    cursor: pointer;
+  }
+  .big,.small{
+    width: 52px;
+    height: 21px;
+  }
+  .com{
+    margin-left: 32px;
+    margin-right: 25px;
+  }
+  .suggest{
+    width: 87px;
+    height: 38px;
+  }
+}
+.filterWrap {
+  width: calc(100% - 5px);
+  padding-right: 5px;
+  display: flex;
+  /*justify-content: space-around;*/
+  overflow-x: auto; /* 允许横向滚动 */
+  white-space: nowrap; /* 防止子元素换行 */
+  padding-bottom: 10px;
+  -webkit-overflow-scrolling: touch; /* 在iOS上平滑滚动 */
+  scrollbar-width: none; /* Firefox */
+  padding-bottom: 10px;
+  &::-webkit-scrollbar {
+    display: none; /* Chrome/Safari */
+  }
+  .customSel {
+    flex: 0 0 auto; /* 防止子元素被压缩 */
+    width: 80px;
+    height: 25px;
+    background: #F5F5F5;
+    border-radius: 4px;
+    font-size: 10px;
+    color: #323233;
+    margin-left: 5px;
+    ::v-deep .el-input__inner{
+      padding: 0 2px;
+      height: 25px;
+      font-size: 10px;
+      background: #F5F5F5;
+      border-radius: 4px;
+      border: none;
+    }
+    ::v-deep .el-input__icon{
+      line-height: 25px;
+      font-size: 10px;
+      width: 18px;
+      color: #2A5094;
+    }
+    ::v-deep .el-input__suffix{
+      right: 2px;
+    }
+  }
+  .has-value  ::v-deep .el-input__inner{
+    background: #F1F6FF ;
+    color: #007BE9;
+    font-weight: bold;
+    padding-left: 8px;
+  }
+  .has-value ::v-deep .el-input__icon{
+    color: #007BE9;
+  }
+  .priceSel{
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    color: #C0C4CC;
+    .iconSpan{
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      font-size: 8px;
+    }
+  }
+  .has-price{
+    color: #007BE9 !important;
+  }
+}
+.contentWrap{
+  width: 100%;
+  height: calc(100% - 126px);
+  overflow-y: auto;
+  background-color: #F2F2F2 ;
+  box-sizing: border-box;
+  padding: 10px 6px 0;
+  .contentItem{
+    width: 100%;
+    background-color: #FFFFFF;
+    border-radius: 10px;
+    box-sizing: border-box;
+    padding-left: 8px;
+    padding-top: 18px;
+    .item{
+      display: flex;
+      justify-content: space-between;
+      cursor: pointer;
+    }
+    .left{
+      width: 115px;
+      height: 77px;
+      position: relative;
+      .img, .qiugou{
+        width: 115px;
+        height: 77px;
+        border-radius: 7px;
+        margin-right: 10px;
+      }
+      .qiugou{
+        line-height: 77px;
+        text-align: center;
+        color: #FFFFFF;
+        font-size: 18px;
+        letter-spacing: 5px;
+        background-color: #6C81CD;
+      }
+      .img {
+        object-fit: cover; /* 保持比例填充容器，裁剪多余部分 */
+        object-position: center; /* 居中显示 */
+      }
+      .owner_logo {
+        width: 60px;
+        height: 23px;
+        position: absolute;
+        left: -4px;
+        top: -3px;
+      }
+      .saled_logo {
+        width: 76px;
+        height: 48px;
+        position: absolute;
+        left: 24px;
+        top: 16px;
+      }
+    }
+    .right{
+      .title{
+        font-weight: 600;
+        font-size: 14px;
+        color: #212020;
+        line-height: 28px;
+      }
+      .type{
+        font-weight: 400;
+        font-size: 12px;
+        color: #282828;
+        line-height: 23px;
+        width: 200px;
+        white-space: nowrap; /* 强制文本在一行显示 */
+        overflow: hidden; /* 隐藏超出部分 */
+        text-overflow: ellipsis; /* 超出部分显示省略号 */
+      }
+      .date{
+        font-weight: 400;
+        font-size: 11px;
+        color: #999999;
+        line-height: 20px;
+      }
+      .price{
+        color: #FF5533;
+        span:first-child{
+          font-weight: 600;
+          font-size: 13px;
+        }
+        span:nth-child(2){
+          font-weight: bold;
+          font-size: 18px;
+          line-height: 25px;
+          margin-right: 2px;
+        }
+        span:nth-child(3){
+          font-weight: 600;
+          font-size: 11px;
+          line-height: 16px;
+        }
+      }
+      .priceRange{
+        color: #FF5533;
+        display: flex;
+        align-items: center;
+        .num{
+          font-weight: bold;
+          font-size: 18px;
+          margin-right: 5px;
+        }
+        .danwei{
+          font-weight: 600;
+          font-size: 11px;
+        }
+        .su{
+          font-weight: 600;
+          font-size: 11px;
+          margin: 0 6px;
+        }
+      }
+      .line{
+        width: 224px;
+        border-bottom: 2px solid #F5F5F5;
+        margin: 10px 0;
+      }
+    }
+  }
+}
+.poupWrap{
+  width: 100%;
+  padding-top: 20px;
+  padding-left: 20px;
+  .title{
+    font-size: 14px;
+    font-weight: bold;
+    color: #c8c9cc;
+  }
+  .poupContent{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px 20px 10px 10px;
+    .tip,.ipt{
+        margin-bottom: 15px;
+    }
+    .ipt{
+
+    }
+    .btnWrap{
+      width: 100%;
+      text-align: -webkit-right;
+      .btn{
+        width: 80px;
+        height: 30px;
+        line-height: 30px;
+        background-color: #4C81F5;
+        color: #FFFFFF;
+        text-align: center;
+        border-radius: 8px;
+      }
+    }
+  }
+}
+.empty{
+  @include flexTwoCenter;
+  height:calc(100% - 86px);
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+</style>
--- a/src/views/secondHandCar/mineRelease.vue
+++ b/src/views/secondHandCar/mineRelease.vue
@ -0,0 +1,487 @@
+<template>
+  <div class="wrap" >
+    <div class="headerWrap">
+      <img class="bg" src="@/assets/secondHandCar/bg.png" />
+      <div class="nav">
+        <img class="back" @click="goPage('indexList',indexActiveTab)" src="@/assets/secondHandCar/back.png" />
+        <span>我的发布</span>
+        <div style="opacity: 0;" class="back"></div>
+      </div>
+      <div class="tabBar">
+        <div v-for="(item,i) in tabList" :key="i" :class="{'active':activeTab == (i+1)}" @click="tabClickHandle(item)">{{item.name}}
+          <span v-if="i==0 && noPassNum">{{noPassNum}}</span>
+        </div>
+      </div>
+    </div>
+    <div class="contentWrap" v-show="!show">
+      <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
+        <van-list
+            v-model="loading"
+            :finished="finished"
+            finished-text="没有更多了"
+            @load="onLoad"
+        >
+          <div class="contentItem">
+            <div class="item" v-for="(item,index) in pageList" :key="index" @click.stop="itemHandle(item)">
+              <div class="left">
+                <img v-if="item.vehicleAnglePhoto" class="img"   :src="item.vehicleAnglePhoto" />
+                <div v-else class="qiugou">{{item.vehicleType?.substring(0,2)}}</div>
+                <img v-if="item.type==1" class="smallImg"  src="@/assets/secondHandCar/mine_cheyuan.png" />
+                <img v-else class="smallImg"  src="@/assets/secondHandCar/mine_qiugou.png" />
+              </div>
+              <div class="right">
+                <div class="title">
+                  <span>{{item.vehicleType}}</span>
+                  <img class="titleImg"  :src="getStatus(item.status?.code)" />
+                </div>
+
+                                <div v-if="activeTab==0" class="type">{{ item.boardType?.label  ? item.boardType?.label+' | ' : ''}}  {{ item.licenseType?.label }} |
+                  {{ item.mileage }}km | {{item.emissionStandard?.label}}</div>
+
+                <div v-else class="type">{{ item.boardType?.label  ? item.boardType?.label+' | ' : ''}}
+                  {{item.vehicleType }} | {{item.emissionStandard?.label}}</div>
+                <div v-if="item.type==1" class="price">售价（含税）：<span>{{formatNumber(item.minPrice) }}</span> <span>万</span> </div>
+                <div v-else class="priceRange">
+                  售价（含税）：
+                  <span class="num">{{formatNumber(item.minPrice) }}</span> <span  class="danwei">万</span>
+                  <span class="su">~</span>
+                  <span class="num">{{formatNumber(item.maxPrice) }}</span> <span  class="danwei">万</span>
+                </div>
+                <div class="btnWrap">
+                  <img v-if="(activeTab==1 && item.status?.code==3) || activeTab==2"  @click.stop="noMultipleClicks(reviseHandle,item)" class="revise"  src="@/assets/secondHandCar/revise.png" />
+                  <img v-if="(activeTab==1 && (item.status?.code==1 || item.status?.code==3)) || activeTab==2"  @click.stop="noMultipleClicks(xiajiaHandle,item)" class="xiajia"  src="@/assets/secondHandCar/xiajia.png" />
+                  <img v-if="((activeTab==3 && item.status?.code==7) || activeTab==2) && !isToday(item.wapTime)"  @click.stop="noMultipleClicks(polishHandle,item)" class="polish"  src="@/assets/secondHandCar/polish.png" />
+                  <img v-if="activeTab==3 && item.type==1 && item.downReason=='不卖了' "  @click.stop="noMultipleClicks(reShangJiaHandle,item)" class="reshangjia"  src="@/assets/secondHandCar/reshangjia.png" />
+                </div>
+                <div class="line"></div>
+              </div>
+            </div>
+          </div>
+        </van-list>
+      </van-pull-refresh>
+    </div>
+    <div class="empty" v-show="show">
+      <img src="@/assets/empty.png" />
+    </div>
+    <van-popup v-model="poupShow" closeable round  :style="{ width: '70%',height:'18%' }"  class="poupWrap">
+      <span class="title">下架原因</span>
+      <div class="poupContent">
+        <van-radio-group v-model="radio" class="radioWrap">
+          <van-radio name="1">{{xiajiaInfo?.type==1 ? '已售出' : '已买到'}}</van-radio>
+          <van-radio name="2">{{xiajiaInfo?.type==1 ? '不卖了' : '不买了'}}</van-radio>
+        </van-radio-group>
+        <div class="btnWrap">
+          <div class="btn" @click="noMultipleClicks(submitHandle)">确认</div>
+        </div>
+      </div>
+    </van-popup>
+ </div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+import { minePublishPageList,auditFailCount,usedCarPolish,usedCarReShelf,usedCarRemove} from "@/api/secondHandCar"
+export default {
+  name: "mineRelease",
+  mixins:[myMixins],
+  data(){
+    return{
+      activeTab:1,
+      tabList:[{value:1,name:'审核中'},{value:2,name:'已发布'},{value:3,name:'已下架'},],
+      noClick:true,
+      poupShow:false,
+      radio:'',
+      pageList:[],
+      noPassNum:'',
+      showEmpty:false,
+      isLoading:false,
+      xiajiaInfo:'',
+      loading: false,
+      finished: false,
+      pageNum:1,
+      pageSize:10,
+      total:'',
+      indexActiveTab:'',
+    }
+  },
+  async mounted() {
+    this.activeTab =Number(sessionStorage.getItem('mineActiveTab')) || 1;
+    this.indexActiveTab=Number(sessionStorage.getItem('indexActiveTab')) || 0
+    await this.getCount()
+    await this.getList()
+  },
+  methods:{
+    async onLoad(){
+      this.pageNum++;
+      await this.getList()
+      this.loading = false;
+      if (this.pageList.length >= this.total) {
+        this.finished = true;
+      }
+    },
+    onRefresh() {
+      this.pageNum=1
+      setTimeout(() => {
+        this.$toast('刷新成功');
+        this.isLoading = false;
+      }, 1000);
+    },
+    itemHandle(item){//审核
+      this.$router.push({
+        name: item.type==1 ? "forSale" : 'wantBuySale',
+        query: { id:item.id,queryType:3,isList:false},
+      })
+      sessionStorage.setItem('mineActiveTab',String(this.activeTab) )
+    },
+    async getList(){
+      await  this.getCount()
+      let res= await minePublishPageList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        queryType:this.activeTab
+      })
+      this.total=res.total
+      if(this.pageNum == 1){// 第一页直接赋值
+        this.pageList=res.data
+      }else{// 第二页数据拼接
+        let preList = this.pageList;
+        let arr = res.data;
+        this.pageList = preList.concat(arr)
+      }
+    },
+    async getCount(){//获取审核不通数量
+      let res= await auditFailCount()
+      this.noPassNum=res.data
+    },
+    async submitHandle(){//提交下架原因
+      if(!this.radio){
+        this.$toast('下架原因不能为空')
+        return
+      }
+      await usedCarRemove({
+        id:this.xiajiaInfo.id,
+        downReason:this.radio==1 ? (this.xiajiaInfo?.type==1 ? '已售出' : '已买到') : (this.xiajiaInfo?.type==1 ? '不卖了' : '不买了')
+      })
+      this.poupShow=false
+      this.radio = ''
+      await this.getList()
+    },
+    reviseHandle(item){//修改
+      this.$router.push({
+        name: item.type==1 ? "carSource" : 'wantBuy',
+        query: { type:1 ,id:item.id,queryType:3,homePage:false},
+      })
+    },
+    async polishHandle(item){//檫亮
+      try {
+        await usedCarPolish(item.id)
+        this.$toast('你的曝光度已提升')
+        await this.getList()
+      }catch (e){
+        console.log('polishHandle',e)
+      } finally {
+        console.log(1122)
+      }
+    },
+    async reShangJiaHandle(item){//重新上架
+      try {
+        await usedCarReShelf(item.id)
+        await this.getList()
+      } catch (e) {
+        console.log('reShangJiaHandle',e)
+      }
+    },
+    xiajiaHandle(item){//下架
+      this.poupShow=true
+      this.xiajiaInfo=item
+    },
+    isToday(time) {
+      const now = new Date();
+      const targetTime = new Date(time);
+      return (
+          now.getFullYear() === targetTime.getFullYear() &&
+          now.getMonth() === targetTime.getMonth() &&
+          now.getDate() === targetTime.getDate()
+      );
+    },
+    async tabClickHandle(i) {
+      this.activeTab = i.value
+      sessionStorage.setItem('mineActiveTab',String(this.activeTab) )
+      this.pageNum = 1
+      this.pageList = [];
+      this.total=0
+      await this.getList()
+    },
+    getStatus(i){
+      switch (i){
+        case 5://已发布
+          return require('@/assets/secondHandCar/fabuing.png')
+        case 6://已下架
+          return require('@/assets/secondHandCar/alreayXiajia.png')
+        case 7://信息过期
+          return require('@/assets/secondHandCar/expire.png')
+        case 1://待审核
+          return require('@/assets/secondHandCar/wait_verify.png')
+        default://未通过
+          return require('@/assets/secondHandCar/nopass.png')
+      }
+    },
+  },
+  computed:{
+    show() {
+      return (this.pageList.length < 0 || this.pageList.length == 0); // 判断数组长度是否大于 0
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+.wrap {
+  @include wh(100%, 100%);
+  position: relative;
+}
+.headerWrap{
+  width: 100%;
+  box-sizing: border-box;
+  padding: 15px 16px 0;
+  position: relative;
+  .nav {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 15px;
+  }
+  .bg{
+    position: absolute;
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    top: 0;
+    left: 0;
+    opacity: 0.5;
+    z-index: -1;
+  }
+  .back{
+    @include wh(15px,15px);
+  }
+  span{
+    font-weight: bold;
+    font-size: 16px;
+    color: #203152;
+  }
+  .tabBar{
+    display: flex;
+    justify-content: space-around;
+    font-size: 13px;
+    color: #6A727C;
+    height: 30px;
+    line-height: 30px;
+    span{
+      background-color: #4C81F5;
+      padding: 2px 6px;
+      border-radius: 8px;
+      font-size: 12px;
+      color: #FFFFFF;
+    }
+  }
+  .active{
+    font-weight: 600;
+    font-size: 15px;
+    color: #06336D;
+    position: relative;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    background: linear-gradient( 270deg, #33A3FF 0%, #176AFE 100%);
+    border-radius: 2px;
+    @include wh(26px,2px);
+    position: absolute;
+    border-radius: 2px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
+}
+.contentWrap{
+  height: calc(100% - 100px);
+  overflow-y: auto;
+  background-color: #F2F2F2;
+  box-sizing: border-box;
+  padding: 10px 6px 0;
+  margin-top: 10px;
+}
+.contentItem{
+  width: 100%;
+  background-color: #FFFFFF;
+  border-radius: 10px;
+  box-sizing: border-box;
+  padding-left: 8px;
+  padding-top: 18px;
+  .item{
+    display: flex;
+    justify-content: space-between;
+  }
+  .left{
+    position: relative;
+    .img,.qiugou{
+      width: 115px;
+      height: 77px;
+      border-radius: 7px;
+      margin-right: 10px;
+    }
+    .smallImg{
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 36px;
+      height: 18px;
+    }
+    .qiugou{
+      line-height: 77px;
+      text-align: center;
+      color: #FFFFFF;
+      font-size: 18px;
+      letter-spacing: 5px;
+      background-color: #6C81CD;
+    }
+  }
+  .right{
+
+    .title{
+      box-sizing: border-box;
+      padding-right: 18px;
+      font-weight: 600;
+      font-size: 14px;
+      color: #212020;
+      line-height: 28px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .titleImg{
+        width: 43px;
+        height: 14px;
+      }
+    }
+    .type{
+      font-weight: 400;
+      font-size: 12px;
+      color: #282828;
+      line-height: 23px;
+      width: 200px;
+      white-space: nowrap; /* 强制文本在一行显示 */
+      overflow: hidden; /* 隐藏超出部分 */
+      text-overflow: ellipsis; /* 超出部分显示省略号 */
+    }
+    .date{
+      font-weight: 400;
+      font-size: 11px;
+      color: #999999;
+      line-height: 20px;
+    }
+    .price{
+      color: #FF5533;
+      span:first-child{
+        font-weight: bold;
+        font-size: 18px;
+        line-height: 25px;
+        margin-right: 2px;
+      }
+      span:last-child{
+        font-weight: 600;
+        font-size: 11px;
+        line-height: 16px;
+      }
+    }
+    .priceRange{
+      color: #FF5533;
+      display: flex;
+      align-items: center;
+      .num{
+        font-weight: bold;
+        font-size: 18px;
+        margin-right: 5px;
+      }
+      .danwei{
+        font-weight: 600;
+        font-size: 11px;
+      }
+      .su{
+        font-weight: 600;
+        font-size: 11px;
+        margin: 0 6px;
+      }
+    }
+    .line{
+      width: 224px;
+      border-bottom: 2px solid #F5F5F5;
+      margin: 10px 0;
+    }
+    .btnWrap{
+      width: 100%;
+      box-sizing: border-box;
+      padding-right: 18px;
+      text-align: right;
+      img{
+        margin-left: 10px;
+      }
+      img:first-child{
+        margin-left: 0;
+      }
+      .revise,.xiajia{
+        @include wh(56px,25px)
+      }
+      .polish{
+        @include wh(69px,25px)
+      }
+      .reshangjia{
+        @include wh(78px,25px)
+      }
+    }
+  }
+}
+.poupWrap{
+  width: 100%;
+  padding-top: 20px;
+  padding-left: 20px;
+  .title{
+    font-size: 14px;
+    font-weight: bold;
+    color: #c8c9cc;
+  }
+  .radioWrap{
+    display: flex;
+    justify-content: space-around;
+    align-items: center;
+    margin-top: 7px;
+    margin-bottom: 15px;
+  }
+  .poupContent{
+    width: 100%;
+    box-sizing: border-box;
+    padding: 10px 20px 4px 10px;
+    .btnWrap{
+      width: 100%;
+      text-align: -webkit-right;
+      //margin-top: 20px;
+      .btn{
+        width: 80px;
+        height: 30px;
+        line-height: 30px;
+        background-color: #4C81F5;
+        color: #FFFFFF;
+        text-align: center;
+        border-radius: 8px;
+      }
+    }
+  }
+}
+.empty{
+  @include flexTwoCenter;
+  height:calc(100% - 86px);
+  background-color: #FAFAFA;
+  img{
+    width: 100%;
+  }
+}
+</style>
--- a/src/views/secondHandCar/privacy.vue
+++ b/src/views/secondHandCar/privacy.vue
@ -0,0 +1,76 @@
+<template>
+  <div class="wrap" >
+    <div class="headerWrap">
+      <img  class="back" @click="h5GoBack" src="@/assets/secondHandCar/back.png" />
+      <span>免责声明</span>
+      <div style="opacity: 0;" class="back"></div>
+    </div>
+    <div class="contentWrap">
+      <iframe :src="urls"></iframe>
+    </div>
+ </div>
+</template>
+<script>
+import {myMixins} from "@/utils/myMixins"
+export default {
+  name: "privacyComponent",
+  mixins:[myMixins],
+  data(){
+    return{
+      urls:''
+    }
+  },
+  async mounted() {
+    let url='';
+    if (window.location.href.includes('www.sinoassist.com')) {
+      url = 'https://www.sinoassist.com'
+    } else if (window.location.href.includes('ccreview.sino-assist.com')) {
+      url = 'https://ccreview.sino-assist.com'
+    } else if (window.location.href.includes('uat.sino-assist.com')) {
+      url = 'https://api-uat.sino-assist.com'
+    } else {
+      url = 'https://crm1.sino-assist.com'
+    }
+    this.urls=url + '/h5/supplier/dispatch/res/privacy.html'
+  },
+  methods:{ }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+.wrap {
+  @include wh(100%, 100%);
+  position: relative;
+  background-color: #F6F6F6;
+}
+.headerWrap{
+  width: 100%;
+  box-sizing: border-box;
+  padding: 15px 16px;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #FFFFFF;
+  .back{
+    @include wh(15px,15px);
+    cursor: pointer;
+  }
+  span{
+    font-weight: bold;
+    font-size: 16px;
+    color: #203152;
+  }
+}
+.contentWrap{
+  height: calc(100% - 42px);
+  iframe{
+    overflow-y:hidden;
+    width: 100%;
+    height: 100%;
+    background-color: #FFFFFF;
+    border: none;
+  }
+}
+</style>
--- a/src/views/secondHandCar/wantBuy.vue
+++ b/src/views/secondHandCar/wantBuy.vue
@ -0,0 +1,582 @@
+<template>
+  <div class="wrap" >
+    <div class="headerWrap">
+      <img class="bg" src="@/assets/secondHandCar/bg.png" />
+      <div class="navWrap">
+        <div v-if="isWebFunc()" style="opacity: 0;" class="back"></div>
+        <img v-else class="back" @click="backHandle" src="@/assets/secondHandCar/back.png" />
+        <img class="navIcon" src="@/assets/secondHandCar/qiugou_big.png" />
+        <div style="opacity: 0;" class="back"></div>
+      </div>
+      <div class="audit" v-if="status==3 && auditRemark">
+        <span><img class="noAudit" src="@/assets/secondHandCar/noAudit.png" />审核不通过：</span>
+        <span>{{auditRemark}}</span>
+      </div>
+      <div class="audit supplierInfo" v-if="type==2">
+        <div><span>供应商名称：</span><span>{{supplierName}}</span></div>
+        <div><span>供应商编号：</span><span>{{supplierCode}}</span></div>
+      </div>
+    </div>
+    <div class="contentWrap" :class="[type==1 ? 'noContentAudit': 'hasContentAudit']">
+      <div  class="oneContent content">
+        <img class="sort" src="@/assets/secondHandCar/one_qiugou.png"  />
+        <div class="item vehicleTypeItem">
+          <span> <span class="star">*</span>求购类型 </span>
+          <div class="radioWrap">
+            <van-radio-group v-model="form.vehicleType" direction="horizontal">
+              <van-radio name="拖车" :class="{'checked':form.vehicleType=='拖车','vehicleRadio':true}">平板拖车</van-radio>
+              <van-radio name="地库车" :class="{'checked':form.vehicleType=='地库车','vehicleRadio':true}">地库车</van-radio>
+              <van-radio name="牵引车" :class="{'checked':form.vehicleType=='牵引车','vehicleRadio':true}">牵引车</van-radio>
+              <van-radio name="随车吊" :class="{'checked':form.vehicleType=='随车吊','vehicleRadio':true}">随车吊</van-radio>
+              <van-radio name="其他" :class="{'checked':form.vehicleType=='其他','vehicleRadio':true}">其他</van-radio>
+            </van-radio-group>
+            <van-field
+                v-show="form.vehicleType=='其他'"
+                placeholder="请填写求购物品名称"
+                v-model="ortherReason"
+            > </van-field>
+          </div>
+        </div>
+        <div class="item"  v-if="form.vehicleType=='拖车'">
+          <span> <span class="star">*</span>落板方式 </span>
+          <van-radio-group v-model="form.boardType" direction="horizontal" class="radioWrap">
+            <van-radio name="1" :class="{'checked':form.boardType==1}">全落地</van-radio>
+            <van-radio name="2" :class="{'checked':form.boardType==2}">斜落一体</van-radio>
+            <van-radio name="3" :class="{'checked':form.boardType==3}">普通斜板</van-radio>
+            <van-radio name="9" :class="{'checked':form.boardType==9}">不限</van-radio>
+          </van-radio-group>
+        </div>
+        <div class="item vehicleTypeItem" >
+          <span> <span class="star">*</span>排放标准 </span>
+          <van-radio-group v-model="form.emissionStandard" direction="horizontal" class="radioWrap" style="padding-top: 5px">
+            <van-radio name="3" :class="{'checked':form.emissionStandard==3,'vehicleRadio':true}">国3</van-radio>
+            <van-radio name="4" :class="{'checked':form.emissionStandard==4,'vehicleRadio':true}">国4</van-radio>
+            <van-radio name="5" :class="{'checked':form.emissionStandard==5,'vehicleRadio':true}">国5</van-radio>
+            <van-radio name="6" :class="{'checked':form.emissionStandard==6,'vehicleRadio':true}">国6</van-radio>
+            <van-radio name="1" :class="{'checked':form.emissionStandard==1,'vehicleRadio':true}">不限</van-radio>
+          </van-radio-group>
+        </div>
+        <div class="item">
+          <span> <span class="star">*</span>联系号码 </span>
+          <van-field
+              type="number"
+              class="radioWrap"
+              v-model="form.contactNumber"
+              input-align="right"
+
+          > </van-field>
+        </div>
+        <div class="item priceItem">
+          <span> <span class="star">*</span>价格区间 </span>
+          <div style="display: flex;align-items: center" class="price">
+            <el-input  type="tel" v-model.number="form.minPrice" @input="validatePrice">
+              <template slot="suffix" >元
+              </template>
+            </el-input>
+            <span style="font-size: 14px;color: rgba(44, 61, 84, 0.59);margin: 0 6px">-</span>
+            <el-input   type="tel" v-model.number="form.maxPrice" @input="validatePrice1">
+              <template slot="suffix" >元
+              </template>
+            </el-input>
+          </div>
+        </div>
+      </div>
+      <div class="line"></div>
+      <div  class="twoContent content">
+        <img class="sort" src="@/assets/secondHandCar/two_supply.png"  />
+        <el-input class="ipt" v-model.trim="form.desc" type="textarea"  :autosize="{ minRows: 6, maxRows: 6 }"
+                  maxlength="500" show-word-limit placeholder="描述车辆信息：如事故、额外加装、无线遥控"></el-input>
+        <div v-if="type==2" style="margin: 10px 3px">不通过原因</div>
+        <el-input v-if="type==2"  class="ipt" v-model.trim="auditReason" type="textarea"  :autosize="{ minRows: 2, maxRows: 6 }"
+                  maxlength="200" show-word-limit placeholder="请填写不通过原因"></el-input>
+        <div class="checkedWrap"  v-if="type==1">
+          <img v-show="radio==1" @click="radio=0" class="radioIcon" src="@/assets/secondHandCar/checked.png" />
+          <img v-show="radio==0" @click="radio=1" class="radioIcon" src="@/assets/secondHandCar/uncheck.png" />
+          <span>我已阅读并同意</span>
+          <span @click="viewPrivacy">《二手车交易条款》</span>
+        </div>
+        <div class="btnWrap" >
+          <div v-if="type==1" class="btn commonBtn"  @click="noMultipleClicks(submitHandle)">发布</div>
+          <div v-if="type==2"  class="auditBtn">
+            <div  class="commonBtn" @click="noMultipleClicks(auditHandle,0)">审核不通过</div>
+            <div  class="commonBtn" @click="noMultipleClicks(auditHandle,1)"><span style="margin-right: 6px">✔</span>审核通过</div>
+          </div>
+        </div>
+      </div>
+    </div>
+ </div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+import {publishCarInfo, carInfoDetail, auditCarInfo} from "@/api/secondHandCar"
+export default {
+  name: "wantBuy",
+  mixins:[myMixins],
+  data(){
+    return{
+      form:{
+        id:'',
+        type:2,
+        licenseType:'',
+        vehicleType:'',
+        boardType:'',
+        emissionStandard:'',
+        contactNumber:'',
+        minPrice:'',
+        maxPrice:'',
+        desc:'',
+      },
+      radio: 0,
+      ortherReason:'',
+      type:'',
+      id:'',
+      queryType:'',
+      noClick:true,
+      auditReason:'',
+      auditRemark:'',
+      status:'',
+      supplierName:'',
+      supplierCode:'',
+    }
+  },
+  async mounted() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.type=this.$route.query.type || urlParams.get('type');
+    this.id=this.$route.query.id ||  urlParams.get('id');
+    this.queryType=this.$route.query.queryType || urlParams.get('queryType');
+    if( this.id){
+      let res = await carInfoDetail({
+        id:this.id,
+        queryType:this.queryType ,
+      })
+      this.form={...res.data}
+      this.form.boardType=res.data.boardType?.code
+      this.form.emissionStandard=res.data.emissionStandard?.code
+      this.auditRemark=res.data?.auditRemark
+      this.status=res.data?.status?.code
+      this.supplierName=res.data?.supplierName
+      this.supplierCode=res.data?.supplierCode
+      if(res.data.vehicleType.includes(',')){
+        let result=res.data.vehicleType?.split(',')
+        this.form.vehicleType=result[0]
+        this.ortherReason=result[1]
+      }
+    }
+    let wantBuyFormInfo=localStorage.getItem("wantBuyFormInfo") ? JSON.parse(localStorage.getItem("wantBuyFormInfo")) : ''
+    if(!wantBuyFormInfo){
+      return
+    }
+    this.form={...wantBuyFormInfo.form}
+    this.radio=wantBuyFormInfo.radio
+    this.ortherReason=wantBuyFormInfo.ortherReason
+  },
+  methods:{
+    validatePrice(value) {
+      if (value?.startsWith(0) && value?.length > 1) {
+        this.$nextTick(() => {
+          this.form.minPrice = 0
+        })
+      }
+    },
+    validatePrice1(value) {
+      if (value?.startsWith(0) && value?.length > 1) {
+        this.$nextTick(() => {
+          this.form.maxPrice = 0
+        })
+      }
+    },
+    clearStorageFormInfo(){
+      localStorage.setItem("wantBuyFormInfo",'')
+    },
+    backHandle(){
+      if(this.$route.query.homePage){//返回列表
+        this.$router.push({ name: "indexList"})
+      }else{//返回我的发布
+        this.$router.push({ name: "mineRelease"})
+      }
+      this.clearStorageFormInfo();
+    },
+    viewPrivacy(){
+      let data={form:this.form,radio:this.radio,ortherReason:this.ortherReason}
+      localStorage.setItem("wantBuyFormInfo",JSON.stringify(data))
+      this.$router.push({ name: "privacyComponent"})
+    },
+
+    // 审核操作
+    async auditHandle(type){
+      if (!type && !this.auditReason){
+        this.$toast('请填写不通过原因')
+        return
+      }
+      let flag=this.validateHandle()
+      if(flag){
+        this.$toast(flag)
+        return
+      }
+      if (this.form.vehicleType=='拖车' && !this.form.boardType) {
+        this.$toast('落板方式不能为空')
+        return
+      }else if(this.form.vehicleType !=='拖车'){
+        this.form.boardType=''
+      }
+      let rule = this.validationRules.find(item =>
+          item.value === null ||
+          item.value === undefined ||
+          item.value === ''
+      )
+      if(rule){
+        this.$toast(rule.name)
+        return
+      }
+      try {
+        await auditCarInfo({
+          id: this.id,
+          auditResult: type  ? 1 : 0 ,
+          auditReason: this.auditReason,
+          ...this.form,
+          vehicleType: this.ortherReason ? (this.form.vehicleType+','+this.ortherReason) : this.form.vehicleType
+        })
+        this.clearStorageFormInfo()
+        setTimeout(()=>{
+          this.closeParentDialog()
+        },1000)
+      } catch (e){
+        console.log(e)
+      }
+      finally {
+        console.log(type)
+      }
+
+    },
+    // 发布求购
+    async submitHandle(){
+      if (!this.radio) {
+        this.$toast('请勾选我已阅读并同意')
+        return
+      }
+      let flag=this.validateHandle()
+      if(flag){
+        this.$toast(flag)
+        return
+      }
+      if (this.form.vehicleType=='拖车' && !this.form.boardType) {
+        this.$toast('落板方式不能为空')
+        return
+      }else if(this.form.vehicleType !=='拖车'){
+        this.form.boardType=''
+      }
+      let rule = this.validationRules.find(item =>
+          item.value === null ||
+          item.value === undefined ||
+          item.value === ''
+      )
+      if(rule){
+        this.$toast(rule.name)
+        return
+      }
+      try {
+        let res = await publishCarInfo({
+          ...this.form,
+          vehicleType: this.ortherReason ? (this.form.vehicleType+','+this.ortherReason) : this.form.vehicleType
+        })
+        this.clearStorageFormInfo()
+        if(res.code == 200 && !res.msg){
+          this.$toast('发布成功')
+          if(this.isWebFunc()){
+            setTimeout(()=>{
+              this.closeParentDialog()
+            },1000)
+          }else{
+            setTimeout(()=>{
+              this.$router.push({ name: "mineRelease"})
+              sessionStorage.setItem('mineActiveTab',String(1) )
+            },1000)
+          }
+        }else{
+          this.$toast(res.msg)
+        }
+        console.log("发布求购publishCarInfo",res)
+      } catch (e){
+        console.log(e)
+      }
+    },
+    // 手机号验证方法
+    validateHandle() {
+      const contactNumberPattern = /^1[3-9]\d{9}$/; // 手机号正则表达式
+      let str=''
+      if (!this.form.contactNumber) {
+        str='联系方式不能为空'
+      } else if (!contactNumberPattern.test(this.form.contactNumber)) {
+        str='联系方式格式错误'
+      } else {
+        str=''
+      }
+      return str
+    },
+  },
+  computed: {
+    validationRules() {
+      return [
+        { value: this.form.vehicleType, name: '车辆类型不能为空' },
+        { value: this.form.emissionStandard, name: '排放标准不能为空' },
+        { value: this.form.contactNumber, name: '联系方式不能为空' },
+        { value: this.form.minPrice, name: '售价不能为空' },
+        { value: this.form.maxPrice, name: '售价不能为空' },
+      ];
+    },
+  },
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+.wrap {
+  @include wh(100%, 100%);
+  position: relative;
+}
+.headerWrap{
+  width: 100%;
+  box-sizing: border-box;
+  padding-top: 15px;
+  padding-bottom: 15px;
+  position: relative;
+  .navWrap{
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    box-sizing: border-box;
+    padding: 0 16px 10px;
+  }
+  .bg{
+    position: absolute;
+    width: 100%;
+    height: 120px;
+    line-height: 120px;
+    top: 0;
+    left: 0;
+    opacity: 0.5;
+    z-index: -1;
+  }
+  .back{
+    @include wh(15px,15px);
+  }
+  .navIcon{
+    @include wh(84px,21px);
+  }
+  .audit{
+    @include wh(100%,43px);
+    background: #FFF7F4;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 11px;
+    color: #FF6B3B;
+    .noAudit{
+      @include wh(13px,12px);
+      margin-right: 5px;
+      vertical-align: bottom;
+    }
+    span:first-child{
+      font-weight: 600;
+    }
+  }
+  .supplierInfo{
+    justify-content: space-around;
+    background-color: #F5F7F9;
+    color: #606266;
+  }
+}
+.noContentAudit{
+  height: calc(100% - 42px);
+}
+.hasContentAudit{
+  height: calc(100% - 85px);
+}
+.contentWrap{
+  width: 100%;
+  //height: calc(100% - 42px);
+  overflow-y: auto;
+  .sort{
+    @include wh(91px, 19px);
+    margin-bottom: 15px;
+  }
+  .line{
+    width: 100%;
+    border-bottom: 1px solid #F2F2F2;
+    margin-top: 26px;
+    margin-bottom: 17px;
+  }
+  .lastLine{
+    margin-top: 3px !important;
+  }
+  .content{
+    width: 100%;
+    box-sizing: border-box;
+    padding:0 20px;
+  }
+  .oneContent{
+    .priceItem{
+      margin-top: 10px;
+    }
+    .vehicleTypeItem{
+      line-height: 13px !important;
+    }
+    .item{
+      display: flex;
+      //align-items: center;
+      font-weight: 400;
+      font-size: 13px;
+      color: #2C3D54;
+      line-height: 44px;
+      width: 100%;
+      box-sizing: border-box;
+      padding-left: 21px;
+      padding-right: 9px;
+      span:first-child{
+        display: inline-block;
+        width:70px;
+        font-size: 13px;
+        color: rgba(44, 61, 84, 0.59);
+      }
+      span:last-child{
+        display: inline-block;
+        width:calc(100% - 70px);
+        border-bottom: 1px solid #E9E9EA;
+      }
+      .orc{
+        box-sizing: border-box;
+        padding-left: 6px;
+      }
+    }
+    .star{
+      color: #FF4B4B !important;
+      opacity: 1 !important;
+      font-weight: bold;
+      font-size: 12px;
+      margin-right: 6px;
+      margin-left: -6px;
+    }
+    .radioWrap{
+      width:calc(100% - 70px);
+      border-bottom: 1px solid #E9E9EA;
+    }
+    .price{
+      display: flex;
+      align-items: center;
+      justify-content: space-around;
+      ::v-deep .el-input__inner{
+        text-align: center;
+        width: 108px;
+        height: 36px;
+        background: rgba(230,238,255,0.34);
+        border-radius: 4px;
+        border: none;
+      }
+      ::v-deep .el-input__suffix{
+          margin-right: 15px;
+      }
+    }
+  }
+  .twoContent{
+    .checkedWrap{
+      cursor: pointer;
+      color:#808D99 ;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      margin-top: 20px;
+      margin-bottom: 10px;
+      font-size: 12px;
+      .radioIcon{
+        @include wh(16px, 16px);
+        margin-right: 6px;
+      }
+      span:last-child{
+        color: #0E76F4;
+      }
+    }
+    .btnWrap{
+      padding-bottom: 20px;
+      padding-top: 15px;
+    }
+    .commonBtn{
+      height: 46px;
+      line-height: 46px;
+      text-align: center;
+      font-weight: bold;
+      border-radius: 5px;
+      color: #FFFFFF;
+      cursor: pointer;
+    }
+    .btn{
+      width: 296px;
+      background: #4A7FEB;
+      margin: 0 auto;
+      font-size: 15px;
+    }
+    .auditBtn{
+      display: flex;
+      justify-content: space-between;
+      font-size: 14px;
+      box-sizing: border-box;
+      padding: 0 6px;
+      div:first-child{
+        width: 100px;
+        opacity: 0.79;
+        background: #1C2C49;
+      }
+      div:last-child{
+        width: 200px;
+        background: #4A7FEB;
+      }
+    }
+  }
+}
+ ::v-deep .van-icon-success{
+  display: none !important;
+}
+ ::v-deep .van-radio__label{
+   margin-left: 0;
+   width: 54px;
+   //padding: 0px 8px;
+   height: 23px;
+   border-radius: 13px;
+   border: 1px solid #9F9F9F;
+   opacity: 0.5;
+   text-align: center;
+   line-height: 23px;
+   font-size: 12px;
+   color: #323233;
+   opacity: 1;
+ }
+ ::v-deep .van-radio--horizontal{
+   margin-right: 4px;
+ }
+::v-deep .van-radio--horizontal:last-child{
+  margin-right: 0;
+}
+::v-deep  .checked .van-radio__label{
+   background: #FFF1EC !important;
+   border: 1px solid #FF5C26 !important;
+   color: #FE5006 !important;
+   border-radius: 13px !important;
+ }
+::v-deep .vehicleRadio .van-radio__label{
+  margin-bottom: 8px !important;
+}
+::v-deep  .van-field__right-icon{
+  margin-right: 0;
+  padding: 0;
+}
+::v-deep .ipt .el-textarea__inner{
+  background: #F5F7F9;
+  border-radius: 4px;
+  font-size: 12px;
+  border: none;
+}
+::v-deep .van-cell{
+  font-size: 13px;
+}
+</style>
--- a/src/views/secondHandCar/wantBuySale.vue
+++ b/src/views/secondHandCar/wantBuySale.vue
@ -0,0 +1,273 @@
+<template>
+  <div class="wrap" >
+    <div class="headerWrap">
+      <div v-if="isWebFunc()" style="opacity: 0;" class="back"></div>
+      <img v-else class="back" @click="h5GoBack" src="@/assets/secondHandCar/back.png" />
+      <span>求购</span>
+      <div style="opacity: 0;" class="back"></div>
+    </div>
+    <div class="contentWrap">
+      <div class="titleWrap wrapCommon">
+        <div class="info">
+          <span>{{ detailInfo.vehicleType }}</span>
+        </div>
+        <div class="time">
+          <span>{{ detailInfo.createTime?.substring(0,10) }}</span><span>发布</span>
+        </div>
+        <div class="price">
+          售价（含税）：
+          <span class="num">{{formatNumber(detailInfo.minPrice) }}</span> <span  class="danwei">万</span>
+          <span class="su">~</span>
+          <span class="num">{{formatNumber(detailInfo.maxPrice) }}</span> <span  class="danwei">万</span>
+        </div>
+      </div>
+      <div class="detailInfoWrap wrapCommon">
+        <div>
+          <img class="descImg firstDescImg" src="@/assets/secondHandCar/details.png" />
+        </div>
+        <div class="descItem descCommon">
+          <div class="itemInfo">
+            <el-tooltip class="item" effect="dark" :content="detailInfo.vehicleType" placement="top">
+              <span style="cursor: pointer">{{ detailInfo.vehicleType }}</span>
+            </el-tooltip>
+            <span>车辆类型</span>
+          </div>
+          <div class="suGang"></div>
+          <div class="itemInfo">
+            <span>{{ detailInfo.boardType?.label }}&nbsp;&nbsp;</span>
+            <span>落板方式</span>
+          </div>
+          <div class="suGang"></div>
+          <div class="itemInfo">
+            <span>{{ detailInfo.emissionStandard?.label }}</span>
+            <span>排放标准</span>
+          </div>
+        </div>
+        <div>
+          <img class="descImg"  src="@/assets/secondHandCar/description.png" />
+        </div>
+        <div class="descCommon desc">{{detailInfo.desc}}</div>
+      </div>
+      <div  v-if="isList && !detailInfo.selfSupplierPublish"  class="btn"  @click="noMultipleClicks(handle)">我有车源</div>
+    </div>
+ </div>
+</template>
+
+<script>
+import {myMixins} from "@/utils/myMixins"
+import {carInfoDetail, saveRecord} from "@/api/secondHandCar";
+import {Dialog} from "vant";
+export default {
+  name: "wantBuySale",
+  mixins:[myMixins],
+  data(){
+    return{
+      noClick:true,
+      id:'',
+      queryType:'',
+      detailInfo:'',
+      duration:'',
+      startTime: null, // 记录进入时间
+      isList:false,
+    }
+  },
+  async mounted() {
+    window.addEventListener('message', (event) => {
+      if (event.data === 'dialogClosed') {
+        console.log('Dialog 已关闭');
+        this.getDuration(1)
+      }
+    });
+    this.startTime = new Date();
+    const urlParams = new URLSearchParams(window.location.search);
+    this.id=this.$route.query.id ||  urlParams.get('id');
+    this.queryType=this.$route.query.queryType || urlParams.get('queryType');
+    this.isList=this.$route.query.isList || urlParams.get('isList');
+    if( this.id) {
+      let res = await carInfoDetail({
+        id: this.id,
+        queryType: this.queryType,
+      })
+      this.detailInfo = res?.data
+    }
+  },
+  destroyed() {
+    this.getDuration(1)
+  },
+  methods:{
+    getDuration(type){
+      const endTime = new Date();
+      const duration = (endTime - this.startTime) / 1000; // 计算时长（秒）
+      this.saveRecord(duration,type);
+    },
+    async saveRecord(duration,type){
+      await saveRecord({type:type,carInfoId:this.id,duration})
+    },
+    handle(){
+      this.getDuration(2)
+      Dialog.alert({
+        message:this.detailInfo.contactNumber	,
+        confirmButtonText:'拨打电话',
+        showCancelButton:true,
+      }).then(() => {
+        window.location.href = `tel:${this.detailInfo.contactNumber}`;
+      }).catch(() => {
+        // on cancel
+      });
+    },
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import '@/styles/mixin.scss';
+.wrap {
+  @include wh(100%, 100%);
+  position: relative;
+  background-color: #F6F6F6;
+}
+.headerWrap{
+  width: 100%;
+  box-sizing: border-box;
+  padding: 15px 16px;
+  position: relative;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  background: #FFFFFF;
+  .back{
+    @include wh(15px,15px);
+  }
+  span{
+    font-weight: bold;
+    font-size: 16px;
+    color: #203152;
+  }
+}
+.contentWrap{
+  height: calc(100% - 42px);
+  overflow-y: auto;
+  .wrapCommon{
+    width: 100%;
+    background: #FFFFFF;
+    border-radius: 6px;
+    backdrop-filter: blur(5.602678571428572px);
+    box-sizing: border-box;
+    margin: 12px 0;
+  }
+  .titleWrap{
+    margin-top: 10px;
+    height: 108px;
+    padding: 18px 0 15px 21px;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    .info{
+      font-weight: 600;
+      font-size: 15px;
+      color: #212020;
+      line-height: 21px;
+      span{
+        margin-right: 10px;
+      }
+    }
+    .time{
+      font-weight: 400;
+      font-size: 12px;
+      color: #999999;
+      line-height: 17px;
+      span:first-child{
+        margin-right: 20px;
+      }
+    }
+    .price{
+      color: #FF5533;
+      font-weight: 600;
+      display: flex;
+      align-items: center;
+     .num{
+        font-size: 20px;
+       margin-right: 4px;
+      }
+      .danwei,.su{
+        font-size: 11px;
+      }
+      .su{
+        margin: 0 4px;
+      }
+    }
+  }
+  .detailInfoWrap{
+    box-sizing: border-box;
+    padding: 18px 28px 15px 22px;
+    .descImg{
+      @include wh(72px, 19px);
+    }
+    .firstDescImg{
+      margin-bottom: 24px;
+    }
+    .descCommon{
+      width: 100%;
+      box-sizing: border-box;
+      padding-left: 15px;
+    }
+    .descItem{
+      display: flex;
+      justify-content: space-between;
+      align-items: baseline;
+      margin-bottom: 20px;
+    }
+    .itemInfo{
+      display: flex;
+      flex-direction: column;
+      width: 28%;
+      span:first-child{
+        width: 100%;
+        font-weight: bold;
+        font-size: 14px;
+        color: #282828;
+        line-height: 20px;
+        margin-bottom: 2px;
+        white-space: nowrap; /* 强制文本在一行显示 */
+        overflow: hidden; /* 隐藏超出部分 */
+        text-overflow: ellipsis; /* 超出部分显示省略号 */
+      }
+      span:last-child{
+        font-weight: 400;
+        font-size: 10px;
+        color: #999999;
+        line-height: 14px;
+      }
+    }
+    .suGang{
+      width: 1px;
+      height: 8px;
+      border-right: 1px solid #999999;
+      opacity: 0.5;
+    }
+    .desc{
+      font-weight: 400;
+      font-size: 12px;
+      color: #282828;
+      margin-top: 10px;
+    }
+  }
+  .btn{
+    width: 296px;
+    height: 46px;
+    line-height: 46px;
+    text-align: center;
+    font-weight: bold;
+    border-radius: 5px;
+    color: #FFFFFF;
+    background: #4A7FEB;
+    margin: 0 auto;
+    font-size: 15px;
+    position: absolute;
+    bottom: 20px;
+    left: 50%;
+    transform: translateX(-50%);
+    cursor: pointer;
+  }
+}
+</style>
--- a/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
+++ b/src/views/vehicle-maintenance/vehicle-maintenance-list.vue
@ -170,19 +170,13 @@ export default {
        pageSize:this.pageSize,
        queryType:this.activeIndex+1,
      })
-      // this.pageList=res.data
-      // console.log("===",this.pageList)
      this.total=res.total
      if(this.pageNum == 1){// 第一页直接赋值
        this.pageList=res.data
      }else{// 第二页数据拼接
-        console.log("第二页数据拼接")
        let preList = this.pageList;
-        // console.log("preList",preList)
        let arr = res.data;
-        // console.log("arr",arr)
        this.pageList = preList.concat(arr)
-        console.log("this.pageList====",this.pageList)
      }
    },
    goPageDetail(item){
--- a/src/views/workOrder/accounting.vue
+++ b/src/views/workOrder/accounting.vue
@ -73,47 +73,51 @@
        <div class="titleContent">
          <div class="flex-between" v-show="abState">
            <div> 到事发地距离:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput"   type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
+            <div class="halfOpcity"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierSettleMileageAb"/>公里</div>
          </div>
          <div class="flex-between" v-show="bcState">
            <div> 拖车里程:</div>
-            <div class="halfOpcity"><input    type="number" v-model="form.supplierSettleMileageBc"/>公里</div>
+            <div class="halfOpcity"><input class="ipt"    type="number" v-model="form.supplierSettleMileageBc"/>公里</div>
          </div>
          <div class="flex-between" v-show="caState">
            <div>返程里程:</div>
-            <div class="halfOpcity"><input    type="number" v-model="form.supplierSettleMileageCa"/>公里</div>
+            <div class="halfOpcity"><input  class="ipt"   type="number" v-model="form.supplierSettleMileageCa"/>公里</div>
          </div>
          <div class="flex-between" v-show="bridgeAbState">
            <div>ab路桥费:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput"   type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
+            <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountAb"/>元</div>
          </div>
          <div class="flex-between" v-show="bridgeBcState">
            <div>bc路桥费:</div>
-            <div class="halfOpcity"><input @input="validateIntegerInput"   type="number" v-model="form.supplierBridgeAmountBc"/>元</div>
+            <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"  type="number" v-model="form.supplierBridgeAmountBc"/>元</div>
          </div>
          <div class="flex-between" v-show="bridgeCaState">
            <div>ca路桥费:</div>
-            <div class="halfOpcity"><input  @input="validateIntegerInput"  type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
+            <div class="halfOpcity"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle" type="number" v-model="form.supplierBridgeAmountCa"/>元</div>
          </div>
          <div class="flex-between" v-show="waitAmountState">
            <div>等候费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierWaitAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierWaitAmount"/>元</div>
+          </div>
+          <div class="flex-between" v-show="tyreAmountState">
+            <div>小轮个数:</div>
+            <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput" :disabled="isUnsuccessfulSettle"   type="number" v-model="form.tyreNumber"/>个</div>
          </div>
          <div class="flex-between" v-show="tyreAmountState">
            <div>小轮费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierTyreAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  disabled  type="number" v-model="form.supplierTyreAmount"/>元</div>
          </div>
          <div class="flex-between" v-show="dilemmaAmountState && basePriceDisabled">
            <div>困境费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierDilemmaAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input class="ipt"  @input="validateIntegerInput"   type="number" v-model="form.supplierDilemmaAmount"/>元</div>
          </div>
          <div class="flex-between" v-show="basementFeeState">
            <div>地库费:</div>
-            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"   type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle" />元</div>
+            <div class="halfOpcity inputContent"><input @input="validateIntegerInput"  class="ipt"  type="number" v-model="form.supplierBasementFee" :disabled="!isBasementSettle || isUnsuccessfulSettle" />元</div>
          </div>
          <div class="flex-between">
            <div>收取客户金额:</div>
-            <div class="halfOpcity inputContent"><input type="number" v-model="form.supplierCustomerAmount"/>元</div>
+            <div class="halfOpcity inputContent"><input type="number" class="ipt"  v-model="form.supplierCustomerAmount"/>元</div>
          </div>
          <div class="flex-between bgDisable" :class=" { 'flex-between': true, 'bgDisable' : basePriceDisabled } ">
            <div>基本费用:</div>
@ -381,6 +385,8 @@ export default {
        replaceBatteryAmount: '',
        supplierSettleRatio:{},
        contractSettleTypeString:'',
+        tyreNumber:'',
+        taskStatus:{},
      },
      noClick: true,
      loading: false,
@ -412,7 +418,11 @@ export default {
      return this.settleType == '实拖' && this.orderInfo?.contractType == 1 && !['PICC10101', 'PICCSHANGQI', 'PICC101099', 'SAIPCC2021', ''].includes(this.appCode) && !(this.appCode.indexOf("TAIPING") != -1 && this.orderInfo?.malfunctionReason == 2)
    },
    isBasement() {
-      return this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'
+      return this.serviceType == '困境救援' ||this.serviceType == '困境拖车'|| this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障'||this.serviceType =='困境救援（非事故）'||this.serviceType =='困境-吊车（非事故）'
+ },
+    //取消案件和结算比例为按服务不成功结算的案件都不能在后台记账模块填写路桥费、小轮费和地库费；
+    isUnsuccessfulSettle(){
+      return (this.form?.supplierSettleRatio && this.form?.supplierSettleRatio?.code==3 )|| this.form?.taskStatus?.code==19002
    },
  },
  methods: {
@ -499,7 +509,7 @@ export default {
      }else {
        if (this.form.supplierOtherAmount > 0) {
          if (this.form.supplierOtherAmountRemark == '') {
-            this.$alert('请填写其他费用说明');
+            this.$toast('请填写其他费用说明');
            return;
          }
        }
@ -512,11 +522,16 @@ export default {
        } else {
          let data = await accountRecordCompute({
            ...this.form,
-            settleType: this.orderInfo.settleType?.code
+            settleType: this.orderInfo.settleType?.code,
+            taskOrderCostHisId:this.orderInfo.taskOrderCostHisId,
+            orderCode: this.orderInfo.orderCode,
          });
          this.form.supplierBasePrice = data.data.basePrice
          this.form.supplierExtraPrice = data.data.extraPrice
          this.form.supplierSettleAmount = data.data.totalPrice
+          if (data.data?.supplierTyreAmount){
+            this.form.supplierTyreAmount=data.data.supplierTyreAmount
+          }
        }
        // }
        /*if(this.form.cutInsuranceAmount == 1 && this.form.policyState === 0){
@ -633,7 +648,9 @@ export default {
        this.form.supplierBasementFee = this.orderInfo.refBasementFee
      }
      if (this.form.supplierSettleRatio?.code != 5 && (this.serviceType == '困境救援' || this.serviceType == '困境-吊车' || this.serviceType == '困境救援-事故' || this.serviceType == '困境救援-故障')){
-        await this.$alert("该案件为困境案件，需确认填写基本费用")
+        // await this.$alert("该案件为困境案件，需确认填写基本费用")
+        await  this.$toast("该案件为困境案件，需确认填写基本费用")
+        return
      }
    },
    cancelBtn() {
@ -642,12 +659,16 @@ export default {
    async save() {
      if (this.form.supplierOtherAmount > 0) {
        if (this.form.supplierOtherAmountRemark == '') {
-          this.$alert('请填写其他费用说明');
+          this.$toast('请填写其他费用说明');
          return;
        }
      }
+      if (this.isBasement && ((this.form.supplierSettleRatio && this.form?.supplierSettleRatio?.code==3)|| this.form?.taskStatus?.code==19002) && !(this.basePriceDisabled || this.isBasementSettle) && (this.form.supplierBasePrice>this.form.startPrice)){
+        this.$toast('取消或服务不成功结算的困境案件,基本费用的填写不能超过起步价');
+        return;
+      }
      if (this.accountStatus >= 4) {
-        this.$alert('已进入后续流程，不允许操作');
+        this.$toast('已进入后续流程，不允许操作');
        return;
      }
      this.loading = true;
@ -701,7 +722,7 @@ export default {
    },
    async confirmAudit() {
      if (this.accountStatus >= 4) {
-        this.$alert('已进入后续流程，不允许操作');
+        this.$toast('已进入后续流程，不允许操作');
        return;
      }
      this.loading1 = true;
@ -876,11 +897,11 @@ export default {

  .leftTitle {
    opacity: .5;
-    @include wh(60px, 189px);
+    width: 60px;
  }

  .rightContent {
-    height: 189px;
+    /*height: 189px;*/
    width: calc(100% - 60px);
  }

@ -952,10 +973,14 @@ img {

    .halfOpcity {
      opacity: .5;
+      .ipt{
+        border: 1px solid #cccccc !important;
+      }
    }

    .inputContent {
      text-align: right;
+      flex: 1;
    }
  }

--- a/src/views/workOrder/aduitCompleteDetail.vue
+++ b/src/views/workOrder/aduitCompleteDetail.vue
@ -82,7 +82,7 @@
      <span class="content">{{orderInfo.bridgeAmountBc + ' 元' }}</span>
    </div>
    <div class="item" v-show="bridgeCaState">
-      <span class="titleLeft">va路桥费：</span>
+      <span class="titleLeft">ca路桥费：</span>
      <span class="content">{{orderInfo.bridgeAmountCa + ' 元' }}</span>
    </div>
    <div class="item"  v-show="tyreAmountState">