task#14504,删除首页默认服务商id

(cherry picked from commit a7cf0a837e)
task#14504,月总，客户评价率缺少百分号，移动端时效切换折线图数据bugfix,table双loading优化，请求慢时，日期渲染无效日期格式优化
2024-07-30 15:30:48 +08:00 · 2024-07-30 14:45:28 +08:00 · 2024-07-26 18:31:29 +08:00
133 changed files with 7723 additions and 22685 deletions
--- a/.gitignore
+++ b/.gitignore
@ -22,4 +22,3 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/yarn.lock
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -9,23 +9,21 @@
    "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",
    "sass": "^1.65.1",
    "sass-loader": "^13.3.2",
-    "vant": "^2.13.2",
+    "vant": "^2.12.54",
    "vue": "^2.6.14",
    "vue-router": "^3.0.7",
-    "vuex": "^3.6.2"
+    "vuex": "^3.6.2",
+    "element-ui": "^2.15.9",
+    "dayjs": "^1.8.14"
  },
  "devDependencies": {
    "@babel/core": "^7.12.16",
--- a/public/index.html
+++ b/public/index.html
@ -3,7 +3,6 @@
  <head>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-<!--      <meta name="viewport" content="width=device-width, initial-scale=1.0">-->
    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, viewport-fit=cover,user-scalable=no">
    <meta name="format-detection" content="telephone=yes"/>
    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
@ -26,21 +25,20 @@
    <van-number-keyboard safe-area-inset-bottom />
    <script type="text/javascript">
        window._AMapSecurityConfig = {
-            // serviceHost: 'https://api.sinoassist.com/_AMapService',
-          securityJsCode:'91ab1ebc492d5479a68b11527bd73dc9',
+            serviceHost: 'https://api.sinoassist.com/_AMapService',
        }
    </script>
-    <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.AutoComplete,AMap.PlaceSearch,AMap.Geolocation,AMap.Geocoder,AMap.Marker,AMap.Driving"></script>
-<!--    <script src="https://unpkg.com/vconsole@latest/dist/vconsole.min.js"></script>-->
+    <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></script>
+
    <script>
        // VConsole 默认会挂载到 `window.VConsole` 上
        // let vConsole = new window.VConsole();
        (function (doc, win) {
-            // console.log("==window.location.pathname===",window.location.pathname)
            let docEl = doc.documentElement
            let resizeEvt = 'orientationchange' in window ? 'orientationchange' : 'resize'
            recalc = function () {
                var clientWidth = docEl.clientWidth;
+                // console.log("clientWidth",clientWidth)
                if (!clientWidth) return;
                if (clientWidth < 400) {
                    clientWidth = 400;
@ -50,20 +48,13 @@
            if (!doc.addEventListener) return;
            var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
            if (isMobile) {// 是移动端不变
-                // console.log("是移动端不变")
+
            }else{
-                if(window.location.pathname=='/h5/supplier/dispatch/kpiIndex'){
-                    // console.log("执行了执行了")
-                    win.addEventListener(resizeEvt, recalc, false);
-                    doc.addEventListener('DOMContentLoaded', recalc, false);
-                }
-                /*else{
-                    console.log("走着了这种饿 ")
-                }*/
+                win.addEventListener(resizeEvt, recalc, false);
+                doc.addEventListener('DOMContentLoaded', recalc, false);
            }
+            // console.log("isMobile",isMobile)
        })(document, window);
-
    </script>
-
  </body>
 </html>
--- a/public/res/privacy.html
+++ b/public/res/privacy.html
@ -1,78 +0,0 @@
-<!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,14 +27,6 @@ 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({
@ -44,24 +36,6 @@ 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
@ -132,7 +132,7 @@ export function deleteImage(data){
    })
 }
 //新增记账图片 form-data
-/*export function insertRecordPicture(data){
+export function insertRecordPicture(data){
    return request({
        url:'/supplierAppV2/dispatchApp/accountRecord/insertRecordPicture',
        method:'POST',
@ -142,35 +142,27 @@ export function deleteImage(data){
        //     'Content-Type': 'multipart/form-data',
        // },
    })
-}*/
+}

 //开票通知列表
 export function notifyInvoiceList(data){
    return request({
-        url:'/order/taskInvoiceBatch/selectPageList',
+        url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceList',
        method:'POST',
+        contentType:'application/json',
        data
    })
 }
-// contentType:'application/json',
 //开票通知详情
 export function notifyInvoiceDetail(data){
    return request({
-        url:'/order/taskInvoiceBatch/selectById',
+        url:'/supplierAppV2/dispatchApp/accountRecord/notifyInvoiceDetail',
        method:'POST',
+        contentType:'application/json',
        data
    })
 }
-// 关联案件
-export function getOrderListByInvoice(data) {
-    return request({
-        url:'/order/taskOrderCostHisRecord/selectPageList',
-        method:'POST',
-        data
-    })
-}
-
-//  调度app获取新签列表
+// /supplier/supplierTrainingMaterials/pageList 获取培训材料列表
 export function pageList(data){
    return request({
        url:'/supplierAppV2/dispatchApp/user/supplierTrainingMaterialsPageList',
@ -179,31 +171,6 @@ export function pageList(data){
        data
    })
 }
-//  司机app获取新签列表
-export function driverTrainList(key){
-    return request({
-        url:'/supplier/supplierTraining/trainingTask',
-        method:'GET',
-        params:key
-    })
-}
-
-//获取普通材料
-export function getNormalList(key) {
-    return request({
-        url: '/supplier/supplierTraining/normalList',
-        method: 'GET',
-        params:key
-    });
-}
-//获取培训材料
-export function getTrainingList(key) {
-    return request({
-        url: '/supplier/supplierTraining/trainingList',
-        method: 'GET',
-        params:key
-    });
-}
 //用户操作权限
 export function userOperationPermissions(){
    return request({
@ -222,83 +189,6 @@ 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({
@ -308,12 +198,3 @@ 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,78 +77,3 @@ 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
-  })
-}
-
-
-// 获取报警列表
-export function getAlarmList(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/alarmList',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-
-// 获取报警数目
-export function getAlarmCount(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/alarmCount',
-    method:'POST',
-    data
-  })
-}
-
-// 获取报警详情
-export function getAlarmByCode(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/getAlarmByCode',
-    method:'POST',
-    data
-  })
-}
-
-// 处理报警
-export function dealWithAlarm(data) {
-  return request({
-    url: '/supplierAppV2/dispatchApp/alarm/handAlarm',
-    method:'POST',
-    data
-  })
-}
-
-
--- a/src/api/report.js
+++ b/src/api/report.js
@ -1,37 +0,0 @@
-import request from '@/utils/http'
-// 根据订单 获取报备类型
-export function getReportListByOrder(key){
-  return request({
-    url: '/order/baseDriverReportConfigs/getByOrderId',
-    method:'GET',
-    params: key
-  })
-}
-
-// 添加报备
-export function newOrderReporting(data){
-  return request({
-    url: '/supplierAppV2/dispatchApp/order/newOrderReporting',
-    method:'POST',
-    contentType: 'application/json',
-    data
-  })
-}
-
-// 获取报备列表
-export function reportHistory(data){
-  return request({
-    url: '/supplierAppV2/dispatchApp/order/reportHistory',
-    method:'POST',
-    data
-  })
-}
-
-// 获取订单信息
-export function getOrderInfo(data){
-  return request({
-    url: '/supplierAppV2/dispatchApp/order/reportOrderDetail',
-    method:'POST',
-    data
-  })
-}
--- a/src/api/secondHandCar.js
+++ b/src/api/secondHandCar.js
@ -1,96 +0,0 @@
-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/alarm_check.png
+++ b/src/assets/alarm_check.png
--- a/src/assets/alarm_one.png
+++ b/src/assets/alarm_one.png
--- a/src/assets/alarm_repair.png
+++ b/src/assets/alarm_repair.png
--- a/src/assets/alarm_three.png
+++ b/src/assets/alarm_three.png
--- a/src/assets/alarm_tip.png
+++ b/src/assets/alarm_tip.png
--- a/src/assets/alarm_trailer.png
+++ b/src/assets/alarm_trailer.png
--- a/src/assets/alarm_two.png
+++ b/src/assets/alarm_two.png
--- a/src/assets/alarm_unCheck.png
+++ b/src/assets/alarm_unCheck.png
--- a/src/assets/icon_upload.png
+++ b/src/assets/icon_upload.png
--- a/src/assets/report/add_report_address.png
+++ b/src/assets/report/add_report_address.png
--- a/src/assets/report/add_report_arrow.png
+++ b/src/assets/report/add_report_arrow.png
--- a/src/assets/report/add_report_bg.png
+++ b/src/assets/report/add_report_bg.png
--- a/src/assets/report/add_report_close.png
+++ b/src/assets/report/add_report_close.png
--- a/src/assets/report/add_report_dot.png
+++ b/src/assets/report/add_report_dot.png
--- a/src/assets/report/add_report_time.png
+++ b/src/assets/report/add_report_time.png
--- a/src/assets/report/destMarker.png
+++ b/src/assets/report/destMarker.png
--- a/src/assets/report/report_address.png
+++ b/src/assets/report/report_address.png
--- a/src/assets/report/report_ai.png
+++ b/src/assets/report/report_ai.png
--- a/src/assets/report/report_cancel.png
+++ b/src/assets/report/report_cancel.png
--- a/src/assets/report/report_customer.png
+++ b/src/assets/report/report_customer.png
--- a/src/assets/report/report_delay.png
+++ b/src/assets/report/report_delay.png
--- a/src/assets/report/report_dispatch.png
+++ b/src/assets/report/report_dispatch.png
--- a/src/assets/report/report_driver.png
+++ b/src/assets/report/report_driver.png
--- a/src/assets/report/report_fee.png
+++ b/src/assets/report/report_fee.png
--- a/src/assets/report/report_line.png
+++ b/src/assets/report/report_line.png
--- a/src/assets/report/report_logo.png
+++ b/src/assets/report/report_logo.png
--- a/src/assets/report/report_other.png
+++ b/src/assets/report/report_other.png
--- a/src/assets/report/report_unconnect.png
+++ b/src/assets/report/report_unconnect.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,9 +2,6 @@ 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";
-import reportRouter from "@/router/report-router"
 const routes = [
    {
      path: '/',
@ -87,48 +84,15 @@ 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: '工单批次详情'
-        }
-    },
-    {
-        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: '查看发票'
+            title: '开票通知详情'
        }
    },
    {
@ -167,14 +131,6 @@ const routes = [
        path: '/trainDocment',
        name: 'trainDocment',
        component:()=>import('@/views/documentView/trainDocment.vue'),
-        meta: {
-            title:'培训文档',
-        }
-    },
-    {
-        path: '/diverTrainDocment',
-        name: 'diverTrainDocment',
-        component:()=>import('@/views/documentView/diverTrainDocment.vue'),
        meta: {
            title:'培训文档'
        }
@ -187,14 +143,6 @@ const routes = [
            title:'文档资料'
        }
    },
-    {
-        path: '/notificationList',
-        name: 'notificationList',
-        component:()=>import('@/views/index/notificationList'),
-        meta: {
-            title:'告知函'
-        }
-    },
    {
        path: '/caseList',
        name: 'caseList',
@ -232,15 +180,7 @@ const routes = [
        name: 'newTrainingList',
        component:()=>import('@/views/newcomerTraining/newTrainingList.vue'),
        meta: {
-            title:'新服务商培训'
-        }
-    },
-    {
-        path: '/driverTrainingList',
-        name: 'driverTrainingList',
-        component:()=>import('@/views/newcomerTraining/driverTrainingList.vue'),
-        meta: {
-            title:'新师傅培训'
+            title:'新人培训'
        }
    },
    {
@ -251,22 +191,6 @@ const routes = [
            title:'车辆维保'
        }
    },
-    {
-        path: '/vehicleAlarmList',
-        name: 'vehicleAlarmList',
-        component:()=>import('@/views/vehicle-maintenance/vehicle-alarm-list.vue'),
-        meta: {
-            title:'车辆报警'
-        }
-    },
-    {
-        path: '/vehicleAlarmDetail',
-        name: 'vehicleAlarmDetail',
-        component:()=>import('@/views/vehicle-maintenance/vehicle-alarm-detail.vue'),
-        meta: {
-            title:'报警详情'
-        }
-    },
    {
        path: '/maintenanceApplication',
        name: 'maintenanceApplication',
@ -275,26 +199,7 @@ 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,
-    ...reportRouter
  ]

 const router = new VueRouter({
--- a/src/router/invoice-router.js
+++ b/src/router/invoice-router.js
@ -1,11 +0,0 @@
-const invoiceRouter = [
-    {
-        path: '/invoiceIndex',
-        name: 'invoiceIndex',
-        component: () => import('@/views/invoice/invoiceIndex'),
-        meta:{
-            title: '道路救援',
-        }
-    },
-]
-export default invoiceRouter
--- a/src/router/report-router.js
+++ b/src/router/report-router.js
@ -1,21 +0,0 @@
-const reportRouter = [
-  {
-    path: '/reportIndex',
-    name: 'reportIndex',
-    component: () => import('@/views/report/reportIndex'),
-    meta:{
-      title: '道路救援',
-      cache: true,
-      modalState: false,
-    }
-  },
-  {
-    path: '/addressMap',
-    name: 'addressMap',
-    component: () => import('@/views/report/addressMap'),
-    meta:{
-      title: '道路救援',
-    }
-  },
-]
-export default reportRouter
--- a/src/router/second-hand-router.js
+++ b/src/router/second-hand-router.js
@ -1,59 +0,0 @@
-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,6 +45,7 @@ select{
  margin-left: 0;
  font-weight: normal;
  font-size: 14px;
+  //@include fontWeightSize(400,14px);
  color: #000000;
 }

--- a/src/styles/docment.scss
+++ b/src/styles/docment.scss
@ -1,9 +1,8 @@
@import "@/styles/mixin.scss";
-
 .wrap{
  @include wh(100%,100%);
  background-color: #F4F5F7;
-
+  overflow-y: auto;
 }
 .navBar{
  margin-bottom: 46px;
@ -14,44 +13,16 @@
    @include wh(17px, 17px);
  }
 }
-.tab_wrap {
-  @include fontWeightSize(bold, 12px);
-  display: flex;
-  justify-content: space-around;
-  padding: 5px 0 5px 0;
-  @include colorOpa(#737373,0.7);
-  div {
-    padding-top: 8px;
-  }
-  .active {
-    color: #3678FF;
-    position: relative;
-  }
-  .active:after {
-    content: '';
-    display: block;
-    @include wh(50px,2px);
-    background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%);
-    border-radius: 2px;
-    position: absolute;
-    margin-top: 3px;
-    left: 50%;
-    transform: translateX(-50%);
-  }
-}
 .contentWrap{
  @include sizingPadding(0,8px);
-  overflow-y: auto;
  width: 100%;
-  height: calc(100% - 100px);
-  margin-top: 10px;
+  margin-top: 20px;
  .itemWrap{
    margin-bottom: 16px;
-    width: 100%;
-    //@include wh(100%, 300px);
+    @include wh(100%, 300px);
    background: #FFFFFF;
    box-shadow: 0px 2px 10px 0px rgba(216, 216, 216, 0.5);
-    @include sizingPadRadius(6px ,0,6px);
+    @include sizingPadRadius(6px ,0,3px);
    @include flexAround;
    @include fontWeightSize(400, 12px);
    .flexBetween{
@ -60,16 +31,18 @@
    .common{
      margin: 0 15px ;
    }
-    .time{
-      color: rgba(0,0,0,0.7);
-      margin-top: 5px;
-    }
    .imgWrap{
      @include wh(100%,200px);
      position: relative;
-      margin: 6px 0;
      img{
-        @include wh(100%,100%);
+        @include wh(100%,200px);
+      }
+      .name{
+        position: absolute;
+        left: 30px;
+        bottom: 30px;
+        @include fontWeightSize(bold,14px);
+        color: #FFFFFF;
      }
    }
    .left{
--- a/src/styles/driverDocment.scss
+++ b/src/styles/driverDocment.scss
@ -1,103 +0,0 @@
-@import "@/styles/mixin.scss";
-::v-deep .van-nav-bar__content{
-  background-color: #3A3A3A !important;
-}
-.wrap{
-  @include wh(100%,100%);
-  background-color: #F4F5F7;
-
-}
-.navBar{
-  margin-bottom: 46px;
-}
-.search{
-  color: #AAADB3  !important;
-  font-weight: bolder;
-  margin-right: 10px;
-}
-.navLeft{
-  display: flex;
-  flex-direction: column;
-  color: #9C9C9C;
-  font-size: 8px;
-  .icon{
-    font-size: 10px;
-    font-weight: bold;
-    margin-right: 5px;
-    margin-top: 5px;
-  }
-}
-.statisticContainer{
-  box-sizing: border-box;
-  padding: 8px;
-}
-.statisticWrap{
-  @include wh(100%,100px);
-  background: #FFFFFF;
-  box-sizing: border-box;
-  padding: 8px 8px 15px;
-  border-radius: 8px;
-  border: 1px solid #c7c1c1;
-  display: flex;
-  flex-direction: column;
-  justify-content: space-between;
-  .line1{
-    display: flex;
-    justify-content: space-between;
-    span:first-child{
-      font-weight: bolder;
-    }
-    span:last-child{
-      opacity: .7;
-      //font-size: 12px;
-    }
-  }
-  .numWrap{
-    display: flex;
-    justify-content: space-around;
-    div{
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      font-size: 14px;
-      font-weight: 500;
-      span:first-child{
-        margin-bottom: 3px;
-        font-size: 18px;
-      }
-    }
-  }
-}
-.rightWrap {
-  @include flexCenter;
-  .img2 {
-    @include wh(17px, 17px);
-  }
-}
-.driver_tab_wrap {
-  font-size: 12px;
-  display: flex;
-  justify-content: space-around;
-  padding: 5px 0 5px 0;
-  div {
-    padding-top: 8px;
-  }
-  .active {
-    position: relative;
-  }
-  .active:after {
-    content: '';
-    display: block;
-    @include wh(100px,2px);
-    background-color: #E8A524;
-    border-radius: 2px;
-    position: absolute;
-    margin-top: 3px;
-    left: 50%;
-    transform: translateX(-50%);
-  }
-}
-.empty{
-  margin-top: 14px;
-
-}
--- a/src/utils/http.js
+++ b/src/utils/http.js
@ -1,6 +1,7 @@
 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,
@ -10,32 +11,28 @@ const service = axios.create({
  timeout: 10000
 })
 const urlParams = new URLSearchParams(window.location.search);
-let token = urlParams.get('token');
-if( token ) {
-  localStorage.setItem('token', token);
-} else {
-  localStorage.setItem('token', '');
-}
+let token = urlParams.get('token') ;
+localStorage.setItem('token', token);
 service.interceptors.request.use(
    config => {
      let reqUrl=config.url
      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='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJBTkNIQU5HIiwidXNlcklkIjo0NTY3MSwibmFtZSI6IuWuieeVhSIsInVzZXJOYW1lIjoiQU5DSEFORyIsInN1cHBsaWVySWQiOjExMjgsImlzWmQiOjAsImV4cCI6MTc1NTQyMjUyNX0.xzDZhaANJFnbeViIHJA0SEtOyTv7Ja3rKmXqRKRuFkc'
-      // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJTSEhQWEIiLCJ1c2VySWQiOjU0NzI2LCJuYW1lIjoiI-a1i-ivleWwj-eZveeZvSIsInVzZXJOYW1lIjoiU0hIUFhCIiwic3VwcGxpZXJJZCI6MTAwMDE2NSwiZXhwIjoxNzQ0NTEwNzkwfQ.JPk0OA7slYJN3FIi_uhW4Y0CiWRvl6R1dK8MRTbyhD8'
-       if(!(reqUrl=='/supplier/supplierTraining/trainingTask' || reqUrl=='/supplier/supplierTraining/normalList' || reqUrl=='/supplier/supplierTraining/trainingList')){
-         if(token) {
-           config.headers['Authorization'] = `${token}`;
-           config.headers['token'] = `${token}`;
-         }
-       }
+       // alert(token);
+      // let token='4099761587129c46b03c9316c9e866c9'
+      // let token='eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MTI0NTQ5NTMsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiJDLeS4iua1t-a1i-ivleacjeWKoeWVhiIsInN1cHBsaWVySWQiOjMzMDQxLCJzdXBwbGllclR5cGUiOjIsInVzZXJuYW1lIjoic29uZyIsInVzZXJUeXBlIjoicmVzY3VlQXBwIiwiZGV2aWNlSWQiOiIyMmI0OWNhMjBmOWI4MzMwZDk4NzIxNzNmMzllYTY4YmMiLCJhdXRob3JpdGllcyI6W119LCJzY29wZSI6WyJhbGwiXSwiaXNzIjoiaHR0cHM6Ly9zaW5vYXNzaXN0LmNvbSIsImV4cCI6MTcxMjU0MTM1MywiaWF0IjoxNzEyNDU0OTUzfQ.sPU9_OD_TOWcTwqmlawEGyo4mCPrEaRYw2R02gnvYJw'
+          // console.log("tokentokentoken",token)
+      if (reqUrl.includes("/driverApp")) {
+          config.headers['token'] = `${token}`;
+      } else {
+          console.log("调度app")
+          config.headers['Authorization'] = `${token}`;
+      }
      return config
    },
    error => {
+      console.log(error)
      return Promise.reject(error)
    }
 )
@ -43,17 +40,27 @@ 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(res.msg)
+          return Promise.reject(new Error(res.msg || 'Error'))
      } else {
          return res
+        // if( res.code === 200 ) {
+        //   return res.data
+        // } else {
+        //   return res.data
+        // }
      }
    },
    error => {
-        if(error.message != 'Network Error'){
-            Toast(error.message)
-        }
+      console.log('err' + error)
+      Toast(error.message)
      return Promise.reject(error)
    }
 )
--- a/src/utils/map.js
+++ b/src/utils/map.js
@ -36,7 +36,6 @@ export function getAddress(mapContext, lnglat) {
        } else {
          console.log(result)
          alert(JSON.stringify(result))
-          reject(result)
        }
      })
    })
@ -45,7 +44,7 @@ export function getAddress(mapContext, lnglat) {

 // 输入提示
 export function searchFun(mapContext, cityCode, keyword) {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
    mapContext.plugin('AMap.AutoComplete', function(){
      var autoOptions = {
        city: cityCode || '全国',
@ -58,7 +57,7 @@ export function searchFun(mapContext, cityCode, keyword) {
        if(result.info == 'OK') {
          resolve(result.tips)
        } else {
-          resolve([])
+          reject(result)
        }
      })
    })
@ -91,7 +90,6 @@ export function getRoad( mapContext, startLng, startLat, endLng, endLat ) {
 }


-/*
 function drawRoute(route, map) {
  let path = parseRouteToPath(route)

@ -108,4 +106,3 @@ function drawRoute(route, map) {

  map.add(routeLine);
 }
-*/
--- a/src/utils/myMixins.js
+++ b/src/utils/myMixins.js
@ -1,7 +1,9 @@
-
 export const myMixins = {
  data() {
    return {
+      touchStart: [],
+      touchEnd: [],
+      slideShow: true
    }
  },
  methods: {
@ -32,26 +34,19 @@ export const myMixins = {
        window.android.sendMessage("goBack");
      }
    },
-    goH5Detail(item,type){//h5传参到app文档资料，培训文档
-      // console.log("type",type)
+    goH5Detail(item){//h5传参到app文档资料，培训文档
      let data = {
        "action": "goTraining",
        "params": {
-          "id":type == '培训文档' ? Number(1000000+item.id) : item.id,
+          "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 == '培训文档'){
-          window.android.sendMessage("articleId=" +'q'+ item.id);
-        }else{
-          window.android.sendMessage("articleId=" + item.id);
-        }
+        window.android.sendMessage("articleId=" + item.id);
      }
    },
    h5GoBack(){
@ -70,38 +65,12 @@ 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
@ -1,138 +0,0 @@
-<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
@ -1,171 +0,0 @@
-<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
@ -1,176 +0,0 @@
-<template>
-<div class="wrap">
-  <div class="navBar">
-    <van-nav-bar
-        :border="false"
-        :fixed="true"
-        :safe-area-inset-top="true"
-    >
-      <template slot="title">
-        <van-field
-            v-model="keyword"
-            placeholder="名称/关键词/简介"
-        >
-        </van-field>
-      </template>
-      <template slot="left">
-        <div class="navLeft" @click="goBack">
-          <van-icon class="icon" name="arrow-left" />
-          <div>返回</div>
-        </div>
-      </template>
-      <template slot="right">
-          <van-icon class="search" name="search" size="20"  @click="getTrainingList"/>
-      </template>
-    </van-nav-bar>
-  </div>
-  <div class="statisticContainer">
-    <div class="statisticWrap">
-      <div class="line1">
-        <span>培训统计</span>
-        <span>更新时间：{{time}}</span>
-      </div>
-      <div class="numWrap">
-        <div>
-          <span>{{ numInfo?.totalNum }}</span>
-          <span>文章总数</span>
-        </div>
-        <div>
-          <span>{{ numInfo?.readNum }}</span><span>已培训数量</span>
-        </div>
-        <div>
-          <span>{{ numInfo?.notReadNum }}</span> <span>未培训数量</span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="driver_tab_wrap">
-    <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
-         @click="changeTab(index)">
-      {{ item.name }}
-    </div>
-  </div>
-  <div class="contentWrap" v-show="!showEmpty">
-    <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
-      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'培训文档')">
-        <div class="info flexBetween common">
-          <div class="title">{{ item.name }}<span v-if="item.mustRead===1" class="read">必读</span></div>
-        </div>
-        <div class="imgWrap">
-          <img :src="item.themePicture">
-        </div>
-        <div class="num common">{{ item.synopsis }}</div>
-        <div  class="info flexBetween common" >
-          <div class="time">{{ item.pushTime		 }}</div>
-          <span style="color: red;font-size: 14px;margin-right: 8px" :class="item.alreadyRead===1 ? 'alRead' : ''">{{ item.alreadyRead===1 ? '已处理' :  '未处理' }}</span>
-        </div>
-      </div>
-    </van-pull-refresh>
-</div>
-  <div class="empty" v-show="showEmpty">
-    <img src="@/assets/empty.png" />
-  </div>
-</div>
-</template>
-
-<script>
-import {myMixins} from "@/utils/myMixins"
-import {getTrainingList} from  "@/api/mine"
-import {timeFormat} from "@/utils/common";
-export default {
-  name: "diverTrainDocment",
-  computed: {
-  },
-  mixins:[myMixins],
-  data(){
-    return{
-      tabArr: [{name: '车型技术参数', status: 1}, {name: '中道服务规范', status:2},{name: '中道小课堂', status: 3}],
-      activeIndex: 0,
-      pageList:[],
-      totalList:[],
-      numInfo:'',
-      keyword:'',
-      show:false,
-      showEmpty:false,
-      isLoading:false,
-      driverId:'',
-      time:'',
-    }
-  },
-  mounted() {
-    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
-      if (state == 'hidden') {  // 用户离开了
-      }
-      if (state == 'visible') {
-        this.getTrainingList();
-      }
-    });
-  },
-  methods:{
-    onRefresh() {
-      this.getTrainingList()
-      setTimeout(() => {
-        this.$toast('刷新成功');
-        this.isLoading = false;
-      }, 1000);
-    },
-    async changeTab(index) {
-      this.activeIndex = index
-      await this.getTrainingList()
-    },
-    async getTrainingList(){
-      let res= await getTrainingList({
-        type:1,
-        id:this.driverId,
-        text:this.keyword || '',
-      })
-      this.totalList=[]
-      this.pageList=[]
-      this.numInfo=res.data
-      this.totalList=res.data.list
-      let result=[]
-      if(this.activeIndex === 0){
-        result=this.totalList?.filter(q => q.title === '车型技术参数');
-      }else if(this.activeIndex === 1){
-        result=this.totalList?.filter(q => q.title === '中道服务规范');
-      }else if(this.activeIndex === 2){
-        result=this.totalList?.filter(q => q.title === '中道小课堂');
-      }
-      if(result){
-        this.pageList=result[0].materials
-        this.time=timeFormat(Date.now())
-      }
-      if(this.pageList?.length === 0){
-        this.showEmpty  = true
-      }else {
-        this.showEmpty = false
-      }
-    },
-  }
-}
-</script>
-<style scoped lang="scss">
-@import "@/styles/common.scss";
-@import "@/styles/mixin.scss";
-@import "@/styles/docment.scss";
-@import "@/styles/driverDocment.scss";
-.read{
-  padding: 2px 8px;
-  border-radius: 5px;
-  border: 1px solid red;
-  color: red;
-  font-size: 8px;
-}
-.alRead{
-  color: #cccccc !important;
-}
-.contentWrap{
-  height: calc(100% - 180px) !important;
-}
-</style>
--- a/src/views/documentView/docmentList.vue
+++ b/src/views/documentView/docmentList.vue
@ -1,59 +1,28 @@
 <template>
 <div class="wrap">
-  <template v-if="supplierId">
-    <div class="navBar">
-      <van-nav-bar
-          left-arrow
-          left-arrow-color="#FFFFFF"
-          class="supplier"
-          :border="false"
-          :fixed="true"
-          :safe-area-inset-top="true"
-          @click-left="goBack"
-      >
-        <template slot="title">
-          <div v-show="!show">文档资料</div>
-          <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getNormalList"/>
-        </template>
-        <template slot="right">
-          <div class="rightWrap" @click="show = !show">
-            <img src="@/assets/serach.png" class="img2" v-show="!show"/>
-            <img src="@/assets/delKey.png" class="img2" v-show="show" @click="initShow"/>
-          </div>
-        </template>
-      </van-nav-bar>
-    </div>
-  </template>
-  <template v-if="driverId">
-    <div class="navBar">
-      <van-nav-bar
-          :border="false"
-          :fixed="true"
-          :safe-area-inset-top="true"
-      >
-        <template slot="title">
-          <van-field
-              v-model="keyword"
-              placeholder="名称/关键词/简介"
-          >
-            <!--          <template #button>
-                        <van-icon class="search" name="search" size="20"  @click="getTrainingList"/>
-                      </template>-->
-          </van-field>
-        </template>
-        <template slot="left">
-          <div class="navLeft" @click="goBack">
-            <van-icon class="icon" name="arrow-left" />
-            <div>返回</div>
-          </div>
-        </template>
-        <template slot="right">
-          <van-icon class="search" name="search" size="20"  @click="getNormalList"/>
-        </template>
-      </van-nav-bar>
-    </div>
-  </template>
- <div :class="supplierId ? 'tab_wrap' : 'driver_tab_wrap'">
+  <div class="navBar">
+    <van-nav-bar
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="goBack"
+    >
+      <template slot="title">
+        <div v-show="!show">文档资料</div>
+        <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getList"/>
+      </template>
+      <template slot="right">
+        <div class="rightWrap" @click="show = !show">
+          <img src="@/assets/serach.png" class="img2" v-show="!show"/>
+          <img src="@/assets/delKey.png" class="img2" v-show="show" @click="initShow"/>
+        </div>
+      </template>
+    </van-nav-bar>
+  </div>
+
+ <div class="tab_wrap">
    <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
         @click="changeTab(index)">
      {{ item.name }}
@ -61,15 +30,23 @@
  </div>
  <div class="contentWrap" v-show="!showEmpty">
    <van-pull-refresh v-model="isLoading" @refresh="onRefresh" style="min-height:85vh">
-      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'文档资料')">
+      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
        <div class="info flexBetween common">
-          <div class="title">{{ item.name }}</div>
+          <div class="title">{{ item.pushUser }}</div>
+          <div class="time">{{ item.pushTime }}</div>
        </div>
        <div class="imgWrap">
          <img :src="item.themePicture">
+          <div class="name">{{item.name}}</div>
        </div>
        <div class="num common">{{ item.synopsis }}</div>
-        <div class="time common">{{ item.pushTime		 }}</div>
+        <div class="doc flexBetween common">
+          <div class="left">{{ item.docType?.label }}</div>
+          <div class="right">
+            <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
+            <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
+          </div>
+        </div>
      </div>
    </van-pull-refresh>
 </div>
@ -81,36 +58,30 @@

 <script>
 import {myMixins} from "@/utils/myMixins"
-import {getNormalList} from "@/api/mine";
+import {pageList} from "@/api/mine";
 export default {
-  name: "docmentList",
+  name: "trainDocment",
  mixins:[myMixins],
  data(){
    return{
-      tabArr: [{name: '车型技术参数', status: 1}, {name: '中道服务规范', status:2},{name: '中道小课堂', status: 3}, {name: '新手入列', status: 4},],
+      tabArr: [{name: '中道制度', status: 1}, {name: '技术参数', status: 2},],
      activeIndex: 0,
      pageList:[],
-      totalList:[],
+      pageNum:1,
+      pageSize:10,
      keyword:'',
+      trainingType:1,
      isLoading:false,
      show:false,
-      showEmpty:false,
-      supplierId:'',
-      driverId:'',
+      showEmpty:false
    }
  },
  mounted() {
-    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()
+    this.getList()
  },
  methods:{
    onRefresh() {
-      this.getNormalList()
+      this.getList()
      setTimeout(() => {
        this.$toast('刷新成功');
        this.isLoading = false;
@ -118,41 +89,32 @@ export default {
    },
   async changeTab(index) {
    this.activeIndex = index
-    await this.getNormalList()
+    this.pageNum = 1
+    this.pageList = [];
+    if(this.activeIndex === 0){
+      this.trainingType =1
+    }else{
+      this.trainingType=2
+    }
+    await this.getList()
  },
-    async getNormalList(){
-      let res= await getNormalList({
-        type:this.supplierId ? 2 : 1,
-        // type:2,
-        id: this.supplierId ? this.supplierId : this.driverId,
-        // id:this.supplierId,//33041,
-        text:this.keyword || '',
+    async getList(){
+      let res= await pageList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        docType:2,
+        trainingType:this.trainingType,
+        keyword:this.keyword || ''
      })
-      this.totalList=[]
-      this.pageList=[]
-      this.totalList=res.data.list
-      let result=[]
-      if(this.activeIndex === 0){
-        result=this.totalList?.filter(q => q.title === '车型技术参数');
-      }else if(this.activeIndex === 1){
-        result=this.totalList?.filter(q => q.title === '中道服务规范');
-      }else if(this.activeIndex === 2){
-        result=this.totalList?.filter(q => q.title === '中道小课堂');
-      }else if(this.activeIndex === 3){
-        result=this.totalList?.filter(q => q.title === '新手入列');
-      }
-      if(result){
-        this.pageList=result[0].materials
-      }
-      if(this.pageList?.length === 0){
+      this.pageList=res.data;
+      if(res.data.length === 0){
        this.showEmpty  = true
      }else {
        this.showEmpty = false
-      }
-    },
+      }    },
    initShow(){
      this.keyword= '',
-      this.getNormalList()
+      this.getList()
    }
 }
 }
@ -162,8 +124,29 @@ export default {
@import "@/styles/common.scss";
@import "@/styles/mixin.scss";
@import "@/styles/docment.scss";
-@import "@/styles/driverDocment.scss";
-.supplier ::v-deep .van-nav-bar__content{
-  background-color: #2C395F !important;
+.tab_wrap {
+  @include fontWeightSize(bolder, 15px);
+  display: flex;
+  justify-content: space-around;
+  padding: 5px 0 5px 0;
+  @include colorOpa(#737373,0.7);
+  div {
+    padding-top: 8px;
+  }
+  .active {
+    color: #3678FF;
+    position: relative;
+  }
+  .active:after {
+    content: '';
+    display: block;
+    @include wh(50px,3px);
+    background: linear-gradient(270deg, #33A3FF 0%, #176AFE 100%);
+    border-radius: 2px;
+    position: absolute;
+    margin-top: 3px;
+    left: 50%;
+    transform: translateX(-50%);
+  }
 }
 </style>
--- a/src/views/documentView/trainDocment.vue
+++ b/src/views/documentView/trainDocment.vue
@ -11,7 +11,7 @@
    >
      <template slot="title">
         <div v-show="!show">培训文档</div>
-         <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getTrainingList"/>
+         <van-field v-model="keyword" placeholder="请输入关键词" v-show="show"   @input="getList"/>
      </template>
      <template slot="right">
        <div class="rightWrap" @click="show = !show">
@ -21,26 +21,25 @@
      </template>
    </van-nav-bar>
  </div>
-  <div class="tab_wrap">
-    <div v-for="(item, index) in tabArr" :key="index" :class="{'active' : activeIndex == index}"
-         @click="changeTab(index)">
-      {{ item.name }}
-    </div>
-  </div>
+
  <div class="contentWrap" v-show="!showEmpty">
    <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
-      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item,'培训文档')">
+      <div class="itemWrap" v-for="(item,index) in  pageList" :key="index" @click="goH5Detail(item)">
        <div class="info flexBetween common">
-          <div class="title">{{ item.name }}<span v-if="item.mustRead===1" class="read">必读</span></div>
-<!--          <div class="time">{{ item.pushTime		 }}</div>-->
+          <div class="title">{{ item.pushUser }}</div>
+          <div class="time">{{ item.pushTime }}</div>
        </div>
        <div class="imgWrap">
          <img :src="item.themePicture">
+          <div class="name">{{item.name}}</div>
        </div>
        <div class="num common">{{ item.synopsis }}</div>
-        <div  class="info flexBetween common" >
-          <div class="time">{{ item.pushTime		 }}</div>
-          <span style="color: red;font-size: 14px;margin-right: 8px" :class="item.alreadyRead===1 ? 'alRead' : ''">{{ item.alreadyRead===1 ? '已处理' :  '未处理' }}</span>
+        <div class="doc flexBetween common">
+          <div class="left">{{ item.docType?.label }}</div>
+          <div class="right">
+            <span style="color: red;font-size: 14px;margin-right: 8px">{{ item.listShowButton==null ? '已处理' :  '未处理' }}</span>
+            <span style="opacity: .9;color: #ccc">阅读  {{item.readCount}}</span>
+          </div>
        </div>
      </div>
    </van-pull-refresh>
@ -53,7 +52,7 @@

 <script>
 import {myMixins} from "@/utils/myMixins"
-import {getTrainingList} from  "@/api/mine"
+import {pageList} from  "@/api/mine"
 export default {
  name: "trainDocment",
  computed: {
@ -61,65 +60,35 @@ export default {
  mixins:[myMixins],
  data(){
    return{
-      tabArr: [{name: '车型技术参数', status: 1}, {name: '中道服务规范', status:2},{name: '中道小课堂', status: 3}],
-      activeIndex: 0,
      pageNum:1,
      pageSize:10,
      pageList:[],
-      totalList:[],
      keyword:'',
      show:false,
      showEmpty:false,
      isLoading:false,
-      supplierId:'',
    }
  },
  mounted() {
-    const urlParams = new URLSearchParams(window.location.search);
-    this.supplierId = urlParams.get('supplierId');
-    this.getTrainingList();
-    document.addEventListener('visibilitychange', async (  ) => {
-      let state = document.visibilityState
-      if (state == 'hidden') {  // 用户离开了
-      }
-      if (state == 'visible') {
-        this.getTrainingList();
-      }
-    });
+    this.getList();
  },
  methods:{
    onRefresh() {
-      this.getTrainingList()
+      this.getList()
      setTimeout(() => {
        this.$toast('刷新成功');
        this.isLoading = false;
      }, 1000);
    },
-    async changeTab(index) {
-      this.activeIndex = index
-      await this.getTrainingList()
-    },
-    async getTrainingList(){
-      let res= await getTrainingList({
-        type:2,
-        id: this.supplierId,
-        text:this.keyword || '',
+    async getList(){
+      let res= await pageList({
+        pageNum:this.pageNum,
+        pageSize:this.pageSize,
+        docType:1,
+        keyword:this.keyword || ''
      })
-      this.totalList=[]
-      this.pageList=[]
-      this.totalList=res.data.list
-      let result=[]
-      if(this.activeIndex === 0){
-        result=this.totalList?.filter(q => q.title === '车型技术参数');
-      }else if(this.activeIndex === 1){
-        result=this.totalList?.filter(q => q.title === '中道服务规范');
-      }else if(this.activeIndex === 2){
-        result=this.totalList?.filter(q => q.title === '中道小课堂');
-      }
-      if(result){
-        this.pageList=result[0].materials
-      }
-      if(this.pageList?.length === 0){
+      this.pageList=res.data;
+      if(res.data.length === 0){
        this.showEmpty  = true
      }else {
        this.showEmpty = false
@ -127,7 +96,7 @@ export default {
    },
    initShow(){
      this.keyword= '',
-      this.getTrainingList()
+      this.getList()
    }
  }
 }
@ -136,14 +105,4 @@ export default {
@import "@/styles/common.scss";
@import "@/styles/mixin.scss";
@import "@/styles/docment.scss";
-.read{
-  padding: 2px 8px;
-  border-radius: 5px;
-  border: 1px solid red;
-  color: red;
-  font-size: 8px;
-}
-.alRead{
-  color: #cccccc !important;
-}
 </style>
--- a/src/views/index/driverAdd.vue
+++ b/src/views/index/driverAdd.vue
@ -16,26 +16,13 @@
      <img class="startImg" src="@/assets/start.png" />
      <span>身份证正面</span>
    </div>
-<!--    <van-image @click="handlePreview"   @remove="handleRemove" style="width: 54px;height: 54px;" class="camerImg" v-if="identityCardFront" :src="identityCardFront" />-->
-<!--    <el-upload-->
-<!--        v-else-->
-<!--        :action="baseURL + '/order/uploadImage'"-->
-<!--        :headers='authorization'-->
-<!--        accept=".png,.jpg,.jpeg,.zip,.rar,.xlsx,.xsavels,.pdf,.PDF,.doc,.docx"-->
-<!--        :on-success="changeHandle"-->
-<!--        :before-upload="checkImgType"-->
-<!--        class="upload-demo"-->
-<!--        :show-file-list="false"-->
-<!--    >-->
-<!--      <van-icon  slot="default" name="plus" style="font-size: 54px" />-->
-<!--    </el-upload>-->
    <van-uploader
-        v-model="identityCardFrontList"
-        :after-read="identityCardFrontHandler"
-        :max-count="1"
-        :preview-size="54"
-        :max-size="5 * 1024 * 1024"
-        accept="image/*"
+      v-model="identityCardFrontList"
+      :after-read="identityCardFrontHandler"
+      :max-size="5 * 1024 * 1024"
+      max-count="1"
+      :preview-size="54"
+      accept="image "
    />
  </div>
  <div class="lineBot"></div>
@ -152,15 +139,11 @@ import {saveDriver, uploadImage, ocrHandler} from "@/api/mine"
 import TwoCommonBtn from "@/components/twoBtnCommon.vue"
 import CellGroup  from "@/components/cellGroup.vue"
 import {formatDate1} from "@/utils/common"
-// import {ImagePreview} from "vant";
-
 export default {
  name: "driverAdd",
  mixins:[myMixins],
  data(){
    return{
-      // baseURL:'',
-      // licenseOcrInfo:'',
      id:'',
      driverName:"",
      driverPhone:"",
@ -186,22 +169,9 @@ export default {
      idCardAuthority:'',
      idCardValidStartTime:'',
      idCardValidEndTime:'',
-      // authorization:{Authorization: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiJzb25nIiwiYXVkIjpbInN1cHBsaWVyLWFwcCJdLCJuYmYiOjE3MjY4MDk4MTQsInVzZXJfaW5mbyI6eyJ1c2VySWQiOjU0NjU0LCJwaG9uZSI6IjE3NjMwMDM1NjU4IiwibmFtZSI6InNvbmciLCJzdXBwbGllck5hbWUiOiLkuIrmtbfmtYvor5XkvpvlupTllYYiLCJzdXBwbGllcklkIjozMzA0MSwic3VwcGxpZXJUeXBlIjoyLCJ1c2VybmFtZSI6InNvbmciLCJ1c2VyVHlwZSI6InJlc2N1ZUFwcCIsImRldmljZUlkIjoiMTkwZTM1ZjdlMTRhYzdjMDAwNyIsImF1dGhvcml0aWVzIjpbXX0sInNjb3BlIjpbImFsbCJdLCJpc3MiOiJodHRwczovL3Npbm9hc3Npc3QuY29tIiwiZXhwIjoxNzI2ODk2MjE0LCJpYXQiOjE3MjY4MDk4MTR9.5KTAMXZf8ll6HS4Z49YJQ1HiRvHr79Q1goDAGEtsBmY'},
-      // authorization:{Authorization:''},
-      }
+    }
  },
  mounted() {
-  /*  if (window.location.href.includes('www.sinoassist.com')) {
-      this.baseURL = 'https://api.sinoassist.com'
-    } else if (window.location.href.includes('ccreview.sino-assist.com')) {
-      this.baseURL = 'https://api.sinoassist.com'
-    } else {
-      this.baseURL = 'https://api1.sino-assist.com'
-      // this.baseURL = 'http://localhost:8080'
-
-    }
-    let token=localStorage.getItem('token')
-    this.authorization.Authorization=token;*/
    this.id = this.$route.params?.id;
    this.driverName = this.$route.params?.name;
    this.driverPhone = this.$route.params?.phone;
@ -245,41 +215,6 @@ export default {
    isUse(e){
      this.states=e
    },
-    /* checkImgType(file) {
-      const FileExt = file.name.replace(/.+\./, "");
-      const isLt5M = file.size / 1024 / 1024 < 5;
-      const whiteList = ['png', 'jpeg', 'jpg'];
-      if (whiteList.indexOf(FileExt.toLowerCase()) === -1) {
-        this.$message.error("请上传正确的文件格式:" + whiteList.join('、'))
-        return false
-      }
-      if (!isLt5M) {
-        this.$message.error('上传图片大小不能超过 5MB!');
-        return false
-      }
-    },
-   handleRemove() {
-      this.identityCardFront = ''
-    },
-    handlePreview() {
-      ImagePreview({
-        images: this.identityCardFront,
-        startPosition: 1,
-        closeable: true,
-      });
-    },
-    async changeHandle(response) {
-      if (response.success === true) {
-        this.$toast('上传成功')
-        // this.form.identityCardFront = response.data;
-        // await this.ocrFrontHandler()
-        this.identityCardFront = response.data;
-        console.log("this.identityCardFront",this.identityCardFront)
-        await this.idCardOcrHandler();
-      } else {
-        this.$toast('上传失败')
-      }
-    },*/
    async identityCardFrontHandler(file) {    // 上传身份证正面照片
      const formData = new FormData();
      formData.append("file" , file.file);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zhouxueli	dfe999e88e	task#14504,删除首页默认服务商id (cherry picked from commit `a7cf0a837e`)	2024-07-30 15:30:48 +08:00
zhouxueli	abc3aee7dc	task#14504,月总，客户评价率缺少百分号，移动端时效切换折线图数据bugfix,table双loading优化，请求慢时，日期渲染无效日期格式优化	2024-07-30 14:45:28 +08:00
zhouxueli	1868e8c17e	task#14504,清除按钮位置调整，司机搜索使用name (cherry picked from commit `372bbc44c0`)	2024-07-26 18:31:29 +08:00