task#6524 添加刷新按钮

public/index.html

@@ -26,10 +26,11 @@
     <van-number-keyboard safe-area-inset-bottom />
     <script type="text/javascript">
         window._AMapSecurityConfig = {
-            serviceHost: 'https://api.sinoassist.com/_AMapService',
+            // serviceHost: 'https://api.sinoassist.com/_AMapService',
+          securityJsCode:'91ab1ebc492d5479a68b11527bd73dc9',
         }
     </script>
-    <script src="https://webapi.amap.com/maps?v=1.4.15&key=2560bbf04daef66c810c5e6a97e8c508&plugin=AMap.Polyline"></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>
         // VConsole 默认会挂载到 `window.VConsole` 上

src/api/report.js

@@ -0,0 +1,37 @@
+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
+  })
+}

src/router/index.js

@@ -4,6 +4,7 @@ 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: '/',
@@ -277,6 +278,7 @@ const routes = [
     ...kpiRouter,
     ...invoiceRouter,
     ...secondHandRouter,
+    ...reportRouter
   ]
 
 const router = new VueRouter({

src/router/report-router.js

@@ -0,0 +1,21 @@
+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

src/utils/http.js

@@ -11,7 +11,11 @@ const service = axios.create({
 })
 const urlParams = new URLSearchParams(window.location.search);
 let token = urlParams.get('token');
+if( token ) {
   localStorage.setItem('token', token);
+} else {
+  localStorage.setItem('token', '');
+}
 service.interceptors.request.use(
     config => {
       let reqUrl=config.url
@@ -21,12 +25,14 @@ service.interceptors.request.use(
       }
       config.headers['Content-Type'] = config.contentType || 'application/x-www-form-urlencoded'
       let token = localStorage.getItem('token');
-      // let token='4099761587129c46b03c9316c9e866c9'
+      // let token='eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJBTkNIQU5HIiwidXNlcklkIjo0NTY3MSwibmFtZSI6IuWuieeVhSIsInVzZXJOYW1lIjoiQU5DSEFORyIsInN1cHBsaWVySWQiOjExMjgsImlzWmQiOjAsImV4cCI6MTc1MjEzNDc2M30.q1O7C8thZzEMVKYDhBQ-N_14Fh9Bqejj7j11EKLF5Aw'
       // 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}`;
          }
+       }
       return config
     },
     error => {

src/utils/map.js

@@ -36,6 +36,7 @@ export function getAddress(mapContext, lnglat) {
         } else {
           console.log(result)
           alert(JSON.stringify(result))
+          reject(result)
         }
       })
     })
@@ -44,7 +45,7 @@ export function getAddress(mapContext, lnglat) {
 
 // 输入提示
 export function searchFun(mapContext, cityCode, keyword) {
-  return new Promise((resolve, reject) => {
+  return new Promise((resolve) => {
     mapContext.plugin('AMap.AutoComplete', function(){
       var autoOptions = {
         city: cityCode || '全国',
@@ -57,7 +58,7 @@ export function searchFun(mapContext, cityCode, keyword) {
         if(result.info == 'OK') {
           resolve(result.tips)
         } else {
-          reject(result)
+          resolve([])
         }
       })
     })
@@ -90,6 +91,7 @@ export function getRoad( mapContext, startLng, startLat, endLng, endLat ) {
 }
 
 
+/*
 function drawRoute(route, map) {
   let path = parseRouteToPath(route)
 
@@ -106,3 +108,4 @@ function drawRoute(route, map) {
 
   map.add(routeLine);
 }
+*/

src/views/report/addressMap.vue

@@ -0,0 +1,213 @@
+<template>
+  <div class="address_wrap">
+    <div class="map_wrap" id="mapId">
+    </div>
+    <div class="button_wrap">
+      <div class="cancel_btn" @click="cancelHandler">取消</div>
+      <div class="confirm_btn" @click="successHandler">完成</div>
+    </div>
+    <div class="search_wrap">
+      <div class="section">
+        <input type="text" v-model="keyword" @change="searchHandler" placeholder="请输入地址" />
+      </div>
+      <div class="server_list" v-if="keyword">
+        <div class="text_box" v-for="(item, index) in addressList" :key="index" @click="chooseHandler(item, index)" :class="{'active': index == activeIndex}">
+          <div class="address_name">{{ item.name }}</div>
+          <div class="address_detail">{{ ( item.district || '' ) + ( item.address || '' ) }}</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import { searchFun, getLocal, getAddress } from '@/utils/map'
+  export default {
+    name: "addressMap",
+    data() {
+      return {
+        keyword: '',
+        addressList: [],
+        activeIndex: '',
+        map: '',
+        marker: null,
+        cityCode: ''
+      }
+    },
+    watch: {
+      keyword() {
+        this.searchHandler()
+      }
+    },
+    async mounted() {
+      sessionStorage.setItem('reportAddress', '')
+      await this.initMap()
+    },
+    methods: {
+      async initMap() {   // 初始化地图
+        this.map = new AMap.Map('mapId', {
+          viewMode: '2D',  // 默认使用 2D 模式
+          zoom:11,  //初始化地图层级
+        })
+        let res = await getLocal(this.map);
+        let lnglat = new AMap.LngLat(res?.lng, res?.lat);
+        let location = await getAddress(this.map, lnglat)
+        this.cityCode = location?.regeocode.addressComponent.adcode
+        //location?.regeocode?.addressComponent?.city || location?.regeocode?.addressComponent?.province
+        console.log('location', location);
+      },
+      async searchHandler() {
+        this.activeIndex = null
+        if( this.keyword ) {
+          this.addressList = await searchFun(this.map,  this.cityCode, this.keyword,)
+          this.addressList = this.addressList.filter(item => !!item.location)
+        } else {
+          this.addressList = []
+        }
+      },
+      chooseHandler(item, index) {
+        this.activeIndex = index;
+        this.addMarker()
+      },
+      addMarker() {
+        if( this.marker ) {
+          this.map.remove(this.marker)
+        }
+        let content = '<div class="dest-position"></div>';
+        let activeObj = this.addressList[this.activeIndex];
+        this.marker = new AMap.Marker({
+          position: new AMap.LngLat( activeObj.location.lng, activeObj.location.lat ),
+          content: content,
+          offset: new AMap.Pixel(-13, -30)
+        });
+        this.map.add(this.marker)
+        this.map.setCenter([activeObj.location.lng, activeObj.location.lat])
+      },
+      successHandler() {
+        if( this.activeIndex == null ) {
+          this.$toast('请选择具体地址')
+          return
+        }
+        let activeObj = this.addressList[this.activeIndex];
+        let _tempObj = {
+          startPoiAddress: activeObj?.district + activeObj?.address + activeObj?.name,
+          startLat: activeObj?.location?.lat,
+          startLng: activeObj?.location?.lng,
+          adCode: activeObj?.adcode,
+        }
+        sessionStorage.setItem('reportAddress', JSON.stringify(_tempObj))
+        setTimeout(() => {
+          this.$router.go(-1)
+        }, 1)
+      },
+      // 取消 返回上一页
+      cancelHandler() {
+        this.$router.go(-1)
+      },
+    }
+  }
+</script>
+<style>
+  .dest-position {
+    width: 30px;
+    height: 36px;
+    background-size: 100% 100%;
+    background-image: url("~@/assets/report/destMarker.png");
+  }
+</style>
+<style scoped lang="scss">
+  .address_wrap {
+    height: 100%;
+  }
+  .map_wrap {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 60%;
+    z-index: -1;
+  }
+  .button_wrap {
+    width: 100%;
+    padding: 5px;
+    box-sizing: border-box;
+    zoom: 1;
+    position: fixed;
+    top: 0;
+    .cancel_btn {
+      width: 50px;
+      height: 27px;
+      background: #F37877;
+      font-size: 12px;
+      text-align: center;
+      line-height: 27px;
+      color: #fff;
+      border-radius: 3px;
+      float: left;
+    }
+    .confirm_btn {
+      width: 50px;
+      height: 27px;
+      background: rgba(5,193,98,1);
+      font-size: 12px;
+      text-align: center;
+      line-height: 27px;
+      color: #fff;
+      border-radius: 3px;
+      float: right;
+    }
+  }
+  .search_wrap {
+    background-color: #fff;
+    position: fixed;
+    width: 100%;
+    height: 60%;
+    bottom: 0;
+    left: 0;
+    overflow: auto;
+    .section {
+      height: 35px;
+      width: 100%;
+      background-color: #fff;
+      position: fixed;
+      top: 40%;
+      padding-top: 10px;
+      input {
+        width: 90%;
+        margin: 0 auto;
+        display: block;
+        border: none;
+        height: 30px;
+        border-radius: 3px;
+        padding: 0 10px;
+        background: #e2e0e0;
+        font-size: 14px;
+      }
+    }
+    .server_list {
+      overflow-y: auto;
+      padding-top: 30px;
+      .text_box {
+        margin: 10px 25px;
+        padding-top: 10px;
+        .address_name {
+          font-size: 14px !important;
+          color: rgba(0,0,0,0.8);
+        }
+        .address_detail {
+          margin-top: 3px;
+          color: #c3c3c3 !important;
+          font-size: 12px !important;
+        }
+      }
+      .active {
+        .address_name {
+          color: green !important;
+        }
+        .address_detail {
+          color: green !important;
+        }
+      }
+    }
+  }
+</style>

src/views/report/components/report-list-item.vue

@@ -0,0 +1,57 @@
+<template>
+  <div class="bottom_wrap">
+    <div class="report_item" v-for="(item, index) in reportList" @click="goReportHandler(item)" :key="index">
+      <img class="report_icon" :src="item?.iconUrl" alt="">
+      <div class="report_title">{{item.name}}</div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "report-list-item",
+  data() {
+    return {
+      addressReportCode: '',
+
+    }
+  },
+  props: ['reportList'],
+  methods: {
+    goReportHandler(data) {
+      this.$emit('getReport', data);
+    },
+
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.bottom_wrap {
+  width: 100%;
+  /*position: fixed;*/
+  bottom: 0;
+  /*padding: 0 34px 20px;*/
+  padding-bottom: 20px;
+  display: flex;
+  flex-wrap: wrap;
+  background: #FFFFFF;
+  box-shadow: 0px 0px 20px 0px rgba(53,73,93,0.2);
+  box-sizing: border-box;
+  .report_item {
+    width: 25%;
+    margin-top: 20px;
+    text-align: center;
+    .report_icon {
+      width: 45px;
+      height: 45px;
+    }
+    .report_title {
+      color: rgba(53, 53, 53, 0.67);
+      font-size: 11px;
+      line-height: 16px;
+      margin-top: 6px;
+    }
+  }
+}
+</style>

src/views/report/components/service-item.vue

@@ -0,0 +1,112 @@
+<template>
+  <div class="wrap">
+    <div class="service_title">
+      <span class="name">{{orderInfo?.serviceName}}</span>
+      <span class="status">
+        {{orderInfo?.orderStatusString}}
+        <span class="refresh_btn" @click="refreshHandler">刷新</span>
+      </span>
+    </div>
+    <!--    <img class="report_line" src="@/assets/report/report_line.png" alt="">-->
+    <div class="service_content">
+      <div class="content_left">
+        <img class="report_logo" src="@/assets/report/report_logo.png" alt="">
+      </div>
+      <div class="content_right">
+        <div class="order_code">单号：{{orderInfo?.userOrderCode}}</div>
+        <div class="company">单位：{{orderInfo?.supplierName}}</div>
+        <div class="driver_info">
+          <span class="driver_name">{{orderInfo?.driverName}}</span>
+          <span>{{orderInfo?.phone}}</span>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "service-item",
+    props: ['orderInfo'],
+    methods: {
+      refreshHandler() {
+        this.$emit('refresh')
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .wrap {
+    width: calc(100% - 20px);
+    background: #FFFFFF;
+    box-shadow: 0px 0px 9px 0px rgba(53,73,93,0.2);
+    border-radius: 8px;
+    border: 1px solid #E6E6E6;
+    backdrop-filter: blur(5.602678571428572px);
+    margin: 0 auto;
+  }
+.service_title {
+  height: 40px;
+  line-height: 42px;
+  padding-left: 22px;
+  padding-right: 14px;
+  background: #F9FDFF;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #EFEFEF;
+  border-top-left-radius: 8px;
+  border-top-right-radius: 8px;
+  .name {
+    font-size: 16px;
+    font-weight: bold;
+    color: rgba(0, 0, 0, 0.9);
+  }
+  .status {
+    font-size: 13px;
+    color: #F19028;
+  }
+  .refresh_btn {
+    background-color: #267EF0;
+    color: #fff;
+    padding: 6px 12px;
+    margin-left: 5px;
+    border-radius: 3px;
+  }
+}
+.service_content {
+  padding: 11px 16px 18px;
+  display: flex;
+  .content_left {
+    .report_logo {
+      width: 56px;
+      height: 56px;
+      margin-right: 14px;
+    }
+  }
+  .content_right {
+    .order_code {
+      color: #323643;
+      font-size: 16px;
+      font-weight: 600;
+      margin-bottom: 1px;
+    }
+    .company {
+      color: #323643;
+      font-size: 13px;
+      margin-bottom: 3px;
+    }
+    .driver_info {
+      color: rgba(50, 54, 67, 0.65);
+      font-size: 12px;
+      margin-bottom: 3px;
+      .driver_name {
+        margin-right: 10px;
+      }
+    }
+  }
+}
+.report_line {
+
+}
+</style>

src/views/report/reportIndex.vue

@@ -0,0 +1,568 @@
+<template>
+<!--  <van-pull-refresh v-model="isLoading" class="custom-pull-refresh safe-pull-refresh" @refresh="onRefresh">-->
+    <div class="main_wrap">
+      <div class="top_bg" :class="{'dispatch' : type == 1 , 'driver' : type != 1}">
+<!--        <div class="title">报备中心</div>-->
+      </div>
+      <div class="service_wrap">
+        <service-item :order-info="orderInfo" @refresh="onRefreshHandler"></service-item>
+      </div>
+      <div class="chat_list" ref="chatList" >
+        <!--ai对话框 s -->
+        <div v-for="(item, index) in recordList" :key="index">
+          <template v-if="item.messageType == 4">
+            <div class="top_tip_wrap">为了快速解决问题，请选择下方咨询类型</div>
+            <div class="ai_chat" >
+              <div class="ai_left">
+                <img class="report_ai" src="@/assets/report/report_ai.png" alt="">
+              </div>
+              <div class="ai_right">
+                <div class="ai_title">{{ orderInfo?.driverName }}你好，请选择报备内容</div>
+                <ul>
+                  <li v-for="_item in item.content" :key="_item.id" @click="addReportHandler(_item)">“{{_item.name}}”</li>
+                </ul>
+              </div>
+            </div>
+          </template>
+          <template v-if="[2, 3].includes(Number(item.messageType))">
+            <!--ai对话框 e -->
+            <div class="tip_wrap">{{item.createTime}}</div>
+            <!--客服对话框 s -->
+            <div class="customer_item mb20">
+              <div class="customer_left">
+                <img class="profile_photo mr" src="@/assets/report/report_customer.png" alt="">
+              </div>
+              <div class="common_right customer_cls">
+                <div class="customer_status">{{item.reportConfigName}}</div>
+                <div class="response_con">{{item.remark}}</div>
+              </div>
+            </div>
+          </template>
+          <template v-if="item.messageType == 1">
+            <!--服务人员对话框 e -->
+            <div class="tip_wrap">{{item.createTime}}</div>
+            <!--服务人员对话框 s -->
+            <div class="server_item mb20">
+              <div class="common_right service_cls">
+                <div class="service_status">{{item.reportConfigName}}</div>
+                <div class="response_con">{{item.remark}}</div>
+              </div>
+              <div class="customer_left">
+                <img class="profile_photo ml" v-if="type == 1" src="@/assets/report/report_dispatch.png" alt="">
+                <img class="profile_photo ml" v-else src="@/assets/report/report_driver.png" alt="">
+              </div>
+            </div>
+            <!--服务人员对话框 e -->
+          </template>
+        </div>
+      </div>
+      <report-list-item :report-list.sync="reportList" @getReport="getReportHandler" />
+      <van-popup ref="addReportModal" v-model="addReportShow" :close-on-click-overlay="false" closeable duration="0" round position="bottom">
+        <div class="dialog_wrap">
+          <img class="add_report_bg" src="@/assets/report/add_report_bg.png" alt="">
+          <div class="report_content">
+            <template v-if="currentInfo.component == 'time'">
+              <!--预约时间报备 s -->
+              <div class="report_title">
+                <img class="dot" src="@/assets/report/add_report_dot.png" alt="">
+                <span>预约时间</span>
+              </div>
+              <div class="report_time_content" @click="showDatetime = true">
+                <div class="report_time_left">
+                  <img class="add_report_time" src="@/assets/report/add_report_time.png" alt="">
+                  <span>{{appointTime || '请选择时间'}}</span>
+                </div>
+                <img class="report_arrow" src="@/assets/report/add_report_arrow.png" alt="">
+              </div>
+              <!--预约时间报备 e -->
+            </template>
+            <template v-if="currentInfo.component == 'address'">
+              <!--修改地址报备 s -->
+              <div class="report_title">
+                <img class="dot" src="@/assets/report/add_report_dot.png" alt="">
+                <span>修改地址</span>
+              </div>
+              <div class="report_time_content" @click="goPage('addressMap')">
+                <div class="report_time_left">
+                  <img class="add_report_time" src="@/assets/report/add_report_address.png" alt="">
+                  <span>{{address || '请选择地址'}}</span>
+                </div>
+                <img class="report_arrow" src="@/assets/report/add_report_arrow.png" alt="">
+              </div>
+              <!--修改地址报备 e -->
+            </template>
+            <div class="report_title">
+              <img class="dot" src="@/assets/report/add_report_dot.png" alt="">
+              <span>补充报备内容</span>
+            </div>
+            <div class="report_common_content">
+              <textarea class="report_textarea" id="text-input" rows="4" placeholder="点击这里输入补充报备内容" v-model.trim="remark"></textarea>
+  <!--            <van-field-->
+  <!--              v-model="remark"-->
+  <!--              class="report_textarea"-->
+  <!--              placeholder="点击这里输入补充报备内容" />-->
+            </div>
+          </div>
+          <div class="report_btn" @click="saveHandler">
+            提交报备
+          </div>
+        </div>
+      </van-popup>
+
+      <van-popup v-model="showDatetime" round position="bottom">
+        <van-datetime-picker
+          class="dataTime"
+          v-if="showDatetime"
+          v-model="appointTime"
+          type="datetime"
+          :min-date="minDate"
+          @confirm="onConfirm"
+          @cancel="showDatetime = false"
+        />
+      </van-popup>
+    </div>
+<!--  </van-pull-refresh>-->
+</template>
+
+<script>
+  import { getReportListByOrder, reportHistory, newOrderReporting, getOrderInfo } from "@/api/report"
+  import { myMixins} from "@/utils/myMixins";
+  import {timeFormat} from "@/utils/common";
+  import reportListItem from '@/views/report/components/report-list-item'
+  import serviceItem from "@/views/report/components/service-item"
+  import {Dialog, Toast} from "vant";
+  export default {
+    name: "reportIndex",
+    components: { serviceItem, reportListItem },
+    mixins: [myMixins],
+    data() {
+      return {
+        addReportShow: false,
+        remark: '',
+        showDatetime: false,
+        appointTime: '',
+        minDate: new Date(),
+        address: '',
+        lat: '',
+        lng: '',
+        reportList: [],
+        recordList: [],
+        orderInfo: {},
+        type: '',   // 1 调度   2 司机
+        currentInfo: '',
+        userOrderId: '',
+        userOrderCode: '',
+        driverId: '',
+        clickFlag: true,
+        isLoading: false,
+      }
+    },
+    async mounted() {
+      const urlParams = new URLSearchParams(window.location.search);
+      this.userOrderId = this.$route.query.userOrderId || urlParams.get('userOrderId');
+      this.userOrderCode = this.$route.query.userOrderCode || urlParams.get('userOrderCode');
+      this.type = this.$route.query.type || urlParams.get('type');
+      this.driverId = this.$route.query.driverId || urlParams.get('driverId');
+      await this.getReportList();
+      await this.getDetail();
+      await this.getRecordList();
+      await this.scrollToBottom();
+    },
+    activated() {
+      let addressSession = sessionStorage.getItem('reportAddress');
+      if(addressSession) {
+        let _obj = JSON.parse(addressSession)
+        this.address = _obj.startPoiAddress;
+        this.lat = _obj.startLat;
+        this.lng = _obj.startLng;
+        this.adCode = _obj.adCode;
+      }
+    },
+    methods: {
+      onRefreshHandler() {
+        setTimeout(async () => {
+          try {
+            this.recordList = [];
+            await this.getReportList();
+            await this.getDetail();
+            await this.getRecordList();
+            await this.scrollToBottom();
+          } finally {
+            this.isLoading = false; // 结束加载状态
+          }
+        }, 100)
+      },
+      // 添加滚动方法
+      scrollToBottom() {
+        this.$nextTick(() => {
+          const container = this.$refs.chatList
+          container.scrollTop = container.scrollHeight
+        })
+      },
+      async getRecordList() {
+        let recordList = await reportHistory({
+          userOrderId: this.userOrderId,
+          userOrderCode: this.userOrderCode,
+          driverId: this.driverId,
+          source: Number(this.type),
+        })
+        this.recordList = recordList.data;
+      },
+      async saveHandler() {
+        if( this.clickFlag ) {
+          let data = {
+            source: Number(this.type),
+            reportContent: this.remark,
+            userOrderId: Number(this.userOrderId),
+            reportConfigId: this.currentInfo.id,
+            userOrderCode: this.userOrderCode,
+            driverId: this.driverId,
+          }
+          if(this.currentInfo.component == 'time') {
+            if( !this.appointTime ) {
+              Toast('预约时间不能为空')
+              return
+            }
+            if( new Date(this.appointTime).getTime() <= new Date().getTime() ) {
+              Toast('预约时间不能小于当前时间')
+              return
+            }
+            data.time = this.appointTime
+          }
+          if(this.currentInfo.component == 'address') {
+            if( !this.address ) {
+              Toast('地址不能为空')
+              return
+            }
+            data.address = this.address
+            data.lat = this.lat;
+            data.lng = this.lng;
+          }
+          if( !this.remark ) {
+            Toast('备注内容不能为空')
+            return
+          }
+          this.clickFlag = false;
+          try {
+            await newOrderReporting(data)
+            Dialog.alert({
+              title: '提示',
+              message: "报备添加成功"
+            }).then(async () => {
+              await this.getRecordList()
+              this.addReportShow = false
+              this.scrollToBottom();
+              this.initDialogData();
+              this.clickFlag = true
+            });
+          } finally {
+            this.clickFlag = true
+          }
+        }
+      },
+      initDialogData() {
+        this.appointTime = '';
+        this.address = '';
+        this.lat = '';
+        this.lng = '';
+        this.remark = '';
+      },
+      addReportHandler(data) {  // 点击添加报备弹框
+        this.currentInfo = data;
+        this.addReportShow = true
+      },
+      getReportHandler(data) {  // 点击获取当前报备信息
+        this.recordList.push({
+          messageType: 4,
+          content: data.child
+        })
+        this.scrollToBottom();
+      },
+      async getDetail(){  // 订单详情
+        if(this.userOrderId) {
+          let result = await getOrderInfo({
+            userOrderId: this.userOrderId,
+            userOrderCode: this.userOrderCode
+          })
+          this.orderInfo = result.data
+        } else {
+          this.orderInfo = {}
+        }
+
+      },
+      async getReportList() {   // 报备大类
+        let res = await getReportListByOrder({
+          orderId: this.userOrderId
+        });
+        this.reportList = res.data
+      },
+      onConfirm(data) {
+        this.appointTime = timeFormat(new Date(data))
+        this.showDatetime = false;
+      }
+    }
+  }
+</script>
+<style lang="scss">
+  .custom-pull-refresh {
+    height: 100% !important;
+  }
+</style>
+<style lang="scss" scoped>
+  #app {
+    background: #F9FCFF !important;
+    height: 100%;
+  }
+
+  .main_wrap {
+    width: 100%;
+    height: 100%;
+    background: #F9FCFF !important;
+    display: flex;
+    flex-direction: column;
+    // 添加以下样式确保正确的高度计算
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+  }
+.top_bg {
+  width: 100%;
+  height: 87px;
+  /*.title {
+    color: #fff;
+    text-align: center;
+    padding-top: 52px;
+    font-size: 17px;
+    line-height: 24px;
+  }*/
+}
+  .dispatch { // 调度app头部背景色
+    background: #354683;
+  }
+  .driver { // 司机app头部背景色
+    background: #334885;
+  }
+.service_wrap {
+  margin-top: -75px;
+  /*margin-bottom: 20px;*/
+}
+.chat_list {
+  flex: 1;
+  /*overflow: auto;*/
+  overflow-y: auto;
+  overflow-x: hidden;
+  -webkit-overflow-scrolling: touch; // 为了iOS平滑滚动
+  padding-top: 10px;
+  /* 修复 iOS 滚动问题 */
+  transform: translateZ(0);
+  .top_tip_wrap {
+    color: #7C8698;
+    text-align: center;
+    font-size: 13px;
+  }
+  .tip_wrap {
+    color: #7C8698;
+    text-align: center;
+    font-size: 13px;
+    margin-bottom: 10px;
+  }
+  .ai_chat {
+    padding: 25px 10px 20px;
+    display: flex;
+    .ai_left {
+      .report_ai {
+        width: 44px;
+        height: 44px;
+        margin-right: 12px;
+      }
+    }
+    .ai_right {
+      .ai_title {
+        color: #203152;
+        font-size: 15px;
+        font-weight: 600;
+        margin-bottom: 15px;
+      }
+      li {
+        font-size: 13px;
+        color: #267EF0;
+        line-height: 18px;
+        margin-bottom: 15px;
+        font-weight: bold;
+      }
+      li::before {
+        content: "";
+        display: inline-block;
+        width: 8px;
+        height: 8px;
+        background-color: #5680FA;
+        border-radius: 50%; /* 圆形 */
+        margin-right: 10px;
+      }
+    }
+  }
+}
+
+/*客服人员，服务人员对话弹框样式 s*/
+  .profile_photo {
+    width: 44px;
+    height: 44px;
+  }
+  .mr {
+    margin-right: 10px;
+  }
+  .ml {
+    margin-left: 10px;
+  }
+  .mb20 {
+    margin-bottom: 20px;
+  }
+  .customer_item {
+    display: flex;
+    padding-left: 10px;
+    padding-right: 64px;
+    .customer_left {
+    }
+  }
+  .common_right {
+    padding: 11px 13px;
+    flex: 1;
+    .customer_status::before {
+      content: "";
+      display: inline-block;
+      width: 8px;
+      height: 8px;
+      background-color: #5680FA;
+      border-radius: 50%; /* 圆形 */
+      margin-right: 10px;
+    }
+    .customer_status {
+      font-size: 14px;
+      color: #267EF0;
+      line-height: 20px;
+      font-weight: bold;
+    }
+    .service_status {
+      font-size: 14px;
+      color: #F07926;
+      line-height: 20px;
+      font-weight: bold;
+    }
+    .service_status::before {
+      content: "";
+      display: inline-block;
+      width: 8px;
+      height: 8px;
+      background-color: #F07926;
+      border-radius: 50%; /* 圆形 */
+      margin-right: 10px;
+    }
+  }
+  .customer_cls {
+    border-radius: 0px 6px 6px 6px;
+    background: #E3F0FF;
+  }
+  .service_cls {
+    background: #FAEBD8;
+    border-radius: 0px 6px 6px 6px;
+  }
+  .server_item {
+    display: flex;
+    padding-right: 10px;
+    padding-left: 64px;
+  }
+  .response_con {
+    font-size: 13px;
+    color: #242A37;
+    line-height: 18px;
+    font-weight: bold;
+    margin-top: 5px;
+  }
+  /*客服人员，服务人员对话弹框样式 e*/
+  .dialog_wrap {
+    .add_report_bg {
+      width: 100%;
+      height: 76px;
+    }
+    .report_content {
+      width: calc(100% - 12px);
+      margin: -30px auto 0;
+      padding-right: 14px;
+      padding-left: 20px;
+      box-sizing: border-box;
+      background: #fff;
+      position: relative;
+      padding-top: 25px;
+      border-radius: 10px;
+      .report_title {
+        font-size: 16px;
+        font-weight: 600;
+        color: #267EF0;
+        line-height: 22px;
+        margin-bottom: 10px;
+        .dot {
+          width: 7px;
+          height: 6px;
+          margin-right: 12px;
+        }
+      }
+      .report_time_content {
+        padding: 13px;
+        background: #F2F7FF;
+        border-radius: 6px;
+        border: 1px solid #E2EAF6;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 30px;
+        .report_time_left {
+          font-size: 14px;
+          font-weight: bold;
+          color: rgba(0, 0, 0, 0.9);
+          display: flex;
+          align-items: flex-start;
+        }
+        .add_report_time {
+          width: 18px;
+          height: 18px;
+          margin-right: 8px;
+        }
+        .report_arrow {
+          width: 8px;
+          height: 12px;
+          margin-left: 5px;
+        }
+      }
+      .report_common_content {
+        margin-bottom: 27px;
+        .report_textarea {
+          width: 100%;
+          box-sizing: border-box;
+          background: #F8FAFC;
+          border-radius: 6px;
+          min-height: 95px;
+          border: 1px solid #E2EAF6;
+          padding: 10px;
+          font-size: 13px;
+        }
+      }
+    }
+    .report_btn {
+      width: calc(100% - 80px);
+      height: 46px;
+      line-height: 46px;
+      background: #005DD5;
+      border-radius: 23px;
+      color: #FFFFFF;
+      font-size: 15px;
+      font-weight: bold;
+      text-align: center;
+      margin: 0 auto 40px;
+    }
+  }
+  ::v-deep .van-popup__close-icon {
+    color: #0F458E;
+  }
+</style>

src/views/secondHandCar/forSale.vue

@@ -3,7 +3,7 @@
     <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>
+      <span>{{detailInfo.status.code !== 6 ? '在售' : '已售出'}}</span>
       <div style="opacity: 0;" class="back"></div>
     </div>
     <van-loading v-show="!detailInfo"  class="loadingWrap"  type="spinner" color="#1989fa" />
@@ -40,11 +40,14 @@
           <div class="time">
             <span>{{ detailInfo.createTime?.substring(0,10) }}</span><span>{{ detailInfo.areaName }}</span><span>发布</span>
           </div>
+          <div class="priceWrap">
             <div class="price">
               售价（含税）：
               <span>{{ formatNumber(detailInfo.minPrice) }}</span>
               <span>万</span>
             </div>
+            <div class="viewNum">{{detailInfo.attentionCount}}人想要<span>{{detailInfo.browseCount}}人浏览</span></div>
+          </div>
         </div>
         <div class="detailInfoWrap wrapCommon">
           <div>
@@ -106,7 +109,7 @@
           <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 v-if="isList && !detailInfo.selfSupplierPublish && detailInfo.status.code !== 6" class="btn commonBtn"  @click="noMultipleClicks(handle)">我想要</div>
         </div>
       </div>
     </div>
@@ -292,6 +295,18 @@ export default {
         margin-left: 10px;
       }
     }
+    .priceWrap{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .viewNum{
+        //color: #ccc;
+        margin-right: 15px;
+        span{
+          margin-left: 10px;
+        }
+      }
+    }
     .price{
       color: #FF5533;
       line-height: 28px;

src/views/secondHandCar/indexList.vue

@@ -81,6 +81,24 @@
           :value="item.value">
         </el-option>
       </el-select>
+      <el-input readonly  @focus="areaShow = true" v-model="areaName"  placeholder="请选择发布省市" :class="{'customSel':true,'customInput':true , 'has-value': areaName }" >
+        <template #suffix>
+          <i
+              v-if="areaName"
+              class="el-icon-circle-close el-input__icon"
+              @click="areaName = ''"
+          ></i>
+        </template>
+      </el-input>
+      <el-input readonly @focus="showDatePicker = true"  v-model="dateVal"  placeholder="请选择发布日期" :class="{'customSel':true,'customInput':true , 'has-value': dateVal }" >
+        <template #suffix>
+          <i
+              v-if="dateVal"
+              class="el-icon-circle-close el-input__icon"
+              @click="dateVal = ''"
+          ></i>
+        </template>
+      </el-input>
     </div>
     <div class="contentWrap" v-show="!show">
       <van-pull-refresh v-model="isLoading" @refresh="onRefresh"  style="min-height:85vh">
@@ -104,13 +122,21 @@
                   {{ 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 class="priceWrap" v-if="activeTab==0" >
-                <div v-else class="priceRange">
+                  <div class="price">
+                    售价（含税）：<span>￥</span> <span>{{formatNumber(item.minPrice) }}</span> <span>万</span>
+                  </div>
+                  <div class="viewNum">{{item.attentionCount}}人想要<span>{{item.browseCount}}人浏览</span></div>
+                </div>
+                <div v-else class="priceWrap">
+                  <div  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="viewNum">{{item.attentionCount}}人想卖<span>{{item.browseCount}}人浏览</span></div>
+                </div>
                 <div class="line"></div>
               </div>
             </div>
@@ -134,20 +160,74 @@
           </div>
       </div>
     </van-popup>
+    <van-calendar v-model="showDatePicker"  :min-date="minDate"
+                  :max-date="maxDate" type="range" @confirm="onConfirm" />
+    <van-popup
+        v-model="areaShow"
+        position="bottom"
+    >
+      <van-area title="标题" :area-list="areaList" :columns-num="2"  closeable="true" :value="areaCode ? String(areaCode) : ''"
+                @cancel="areaShow = false" @confirm="confirmHandle"/>
+    </van-popup>
   </div>
 </template>
 
 <script>
 import {myMixins} from "@/utils/myMixins"
 import {appPageList,userFeedback } from "@/api/secondHandCar"
+import {areaList} from "@vant/area-data";
 export default {
   name: "indexList",
   mixins:[myMixins],
+  data(){
+    return{
+      areaList: areaList,
+      pageList:[],
+      topSearch:'',
+      activeTab:0,
+      isLoading:"",
+      loading: false,
+      finished: false,
+      pageNum:1,
+      pageSize:10,
+      total:'',
+      licenseType:'',
+      vehicleType:'',
+      priceSort:'',
+      emissionStandard:'',
+      boardType:'',
+      proprietary: '',
+      areaCode:'',
+      areaName:'',
+      startTime:'',
+      endTime:'',
+      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:'',
+      dateVal: '',
+      showDatePicker: false,
+      areaShow:false,
+      isClearing:false,
+      minDate: new Date(1970, 0, 1),  // 设置最小可选日期（1970年1月1日）
+      maxDate: new Date(2099, 11, 31) // 设置最大可选日期（2099年12月31日）
+    }
+  },
   watch:{
-  /*  topSearch(){
-      this.setSearchVal();
-      this.getList()
-    },*/
     licenseType(){
       this.setSearchVal();
       this.getList()
@@ -167,44 +247,26 @@ export default {
     proprietary() {
       this.setSearchVal();
       this.getList()
-    }
     },
-  data(){
+    areaName() {
-    return{
+      if (!this.areaName){
-      pageList:[],
+        this.areaCode=''
-      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:'',
       }
+      this.setSearchVal();
+      this.getList()
+    },
+    dateVal(val){
+      if(val){
+        let res= this.formatDateTimeRange(val)
+        this.startTime=res.startTime
+        this.endTime=res.endTime
+      }else{
+        this.startTime=''
+        this.endTime=''
+      }
+      this.setSearchVal();
+      this.getList()
+    },
   },
   mounted() {
     this.getSearchVal();
@@ -214,12 +276,29 @@ export default {
       if (state == 'hidden') {  // 用户离开了
       }
       if (state == 'visible') {
-        console.log('visible')
+        // console.log('visible')
       }
     });
   },
-
   methods:{
+    confirmHandle(val){
+      if(val[0].name.includes('市')){
+        this.areaName=val[0].name
+        this.areaCode=val[0].code
+      }else{
+        this.areaName=val[0].name +val[1].name
+        this.areaCode=val[1].code
+      }
+      this.areaShow=false
+    },
+    formatDate(date) {
+      return `${date.getFullYear()}/${date.getMonth() + 1}/${date.getDate()}`;
+    },
+    onConfirm(date) {
+      const [start, end] = date;
+      this.showDatePicker = false;
+      this.dateVal = `${this.formatDate(start)} - ${this.formatDate(end)}`;
+    },
     formatToWan(num) {
       let result = (num / 10000).toString();
       if (result.includes('.')) {
@@ -272,6 +351,9 @@ export default {
       sessionStorage.setItem('emissionStandard',String(this.emissionStandard));
       sessionStorage.setItem('boardType',String(this.boardType));
       sessionStorage.setItem('proprietary',String(this.proprietary));
+      sessionStorage.setItem('areaCode',String(this.areaCode));
+      sessionStorage.setItem('areaName',this.areaName);
+      sessionStorage.setItem('dateVal',this.dateVal);
     },
     getSearchVal(){
       this.activeTab = Number(sessionStorage.getItem('indexActiveTab')) || 0;
@@ -282,6 +364,9 @@ export default {
       this.emissionStandard = Number(sessionStorage.getItem('emissionStandard')) || '';
       this.boardType = Number(sessionStorage.getItem('boardType')) || '';
       this.proprietary = Number(sessionStorage.getItem('proprietary')) || '';
+      this.areaCode=Number(sessionStorage.getItem('areaCode')) || '';
+      this.areaName=sessionStorage.getItem('areaName') || '';
+      this.dateVal=sessionStorage.getItem('dateVal') || '';
     },
     goMine(){//我的发布
       this.$router.push({ name: "mineRelease"})
@@ -339,7 +424,10 @@ export default {
         priceSort:this.priceSort,
         boardType:this.boardType,
         emissionStandard:this.emissionStandard,
-        proprietary: this.proprietary
+        proprietary: this.proprietary,
+        areaCode:this.areaCode,
+        startTime:this.startTime,
+        endTime:this.endTime,
       })
       this.total=res.total
       if(this.pageNum == 1){// 第一页直接赋值
@@ -360,6 +448,17 @@ export default {
         window.android.sendMessage("goBack");
       }
     },
+    formatDateTimeRange(str) {
+      const [startStr, endStr] = str.split(' - ').map(s => s.trim());
+      const startDate = new Date(startStr);
+      const startTime = `${startDate.getFullYear()}-${(startDate.getMonth() + 1).toString().padStart(2, '0')}-${startDate.getDate().toString().padStart(2, '0')} 00:00:00`;
+      const endDate = new Date(endStr);
+      const endTime = `${endDate.getFullYear()}-${(endDate.getMonth() + 1).toString().padStart(2, '0')}-${endDate.getDate().toString().padStart(2, '0')} 23:59:59`;
+      return {
+        startTime,
+        endTime
+      };
+    },
 },
   computed:{
     show() {
@@ -489,6 +588,9 @@ export default {
       right: 2px;
     }
   }
+  .customInput{
+    width: 130px;
+  }
   .has-value  ::v-deep .el-input__inner{
     background: #F1F6FF ;
     color: #007BE9;
@@ -612,6 +714,18 @@ export default {
           line-height: 16px;
         }
       }
+      .priceWrap{
+       /* display: flex;
+        justify-content: space-between;
+        align-items: center;*/
+        .viewNum{
+          //color: #ccc;
+          margin-right: 15px;
+          span{
+            margin-left: 10px;
+          }
+        }
+      }
       .priceRange{
         color: #FF5533;
         display: flex;

src/views/secondHandCar/wantBuySale.vue

@@ -14,12 +14,15 @@
         <div class="time">
           <span>{{ detailInfo.createTime?.substring(0,10) }}</span><span>发布</span>
         </div>
+        <div class="priceWrap">
           <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 class="viewNum">{{detailInfo.attentionCount}}人想卖<span>{{detailInfo.browseCount}}人浏览</span></div>
+        </div>
       </div>
       <div class="detailInfoWrap wrapCommon">
         <div>
@@ -182,6 +185,18 @@ export default {
         margin-right: 20px;
       }
     }
+    .priceWrap{
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .viewNum{
+        //color: #ccc;
+        margin-right: 15px;
+        span{
+          margin-left: 10px;
+        }
+      }
+    }
     .price{
       color: #FF5533;
       font-weight: 600;