CRM_26-07-09#story#8922,抢单链接页面更改及 BI 埋点新增需求

src/api/damagePhoto.js

@@ -0,0 +1,14 @@
+import request from '@/utils/http'
+
+/**
+ * 查询 H5 损伤照片
+ * @param {Object} data - { userOrderId, taskOrderId }
+ */
+export function getDamagePhotos(data) {
+  return request({
+    url: '/api/h5-interface/damagePhotos',
+    method: 'POST',
+    contentType: 'application/json',
+    data
+  })
+}

src/api/environmentPhoto.js

@@ -0,0 +1,10 @@
+import request from '@/utils/http'
+
+export function getBeforeDispatchImage(data) {
+  return request({
+    url: '/supplierAppV2/dispatchApp/order/getBeforeDispatchImage',
+    method: 'POST',
+    contentType: 'application/json',
+    data
+  })
+}

src/router/index.js

@@ -164,6 +164,22 @@ const routes = [
             title: '查看发票'
         }
     },
+    {
+        path: '/damagePhotos',
+        name: 'damagePhotoList',
+        component: () => import('@/views/damagePhoto/damagePhotoList.vue'),
+        meta: {
+            title: '损伤照片'
+        }
+    },
+    {
+        path: '/environmentPhotos',
+        name: 'environmentPhotoList',
+        component: () => import('@/views/environmentPhoto/environmentPhotoList.vue'),
+        meta: {
+            title: '环境照片'
+        }
+    },
     {
         path: "/vehicleManage",
         name: 'vehicleManage',
@@ -337,7 +353,7 @@ const routes = [
         name: 'goToApp',
         component:()=>import('@/views/goToApp/goToApp.vue'),
         meta: {
-            title:'中道小板运输'
+            title:'小板运输司机端'
         }
     },
     ...kpiRouter,

src/views/damagePhoto/damagePhotoList.vue

@@ -0,0 +1,312 @@
+<template>
+  <div class="wrap damage-photo-wrap">
+    <div class="navBar">
+      <van-nav-bar
+        title="损伤照片"
+        left-arrow
+        left-arrow-color="#FFFFFF"
+        :border="false"
+        :fixed="true"
+        :safe-area-inset-top="true"
+        @click-left="h5GoBack"
+      />
+    </div>
+
+    <div class="content-wrap" v-if="loaded">
+      <!-- 案件信息 -->
+      <div class="info-card">
+        <div class="info-item">
+          <span class="info-label">案件号</span>
+          <span class="info-value">{{ info.caseNo || '-' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="info-label">车辆标识</span>
+          <span class="info-value">{{ info.vehicleIdentity || '-' }}</span>
+        </div>
+        <div class="info-item">
+          <span class="info-label">起止路线</span>
+          <span class="info-value">{{ info.route || '-' }}</span>
+        </div>
+      </div>
+
+      <!-- 照片列表 -->
+      <div class="photo-list" v-if="photoList.length">
+        <div class="photo-card" v-for="(item, index) in photoList" :key="index">
+          <div class="photo-title">
+            <span>{{ item.title || '-' }}</span>
+            <span
+              v-if="item.replaced || (item.historyList && item.historyList.length)"
+              class="replaced-tag"
+              @click="showHistory(item)"
+            >被替换</span>
+          </div>
+          <div class="photo-image" @click="previewCurrent(item.currentUrl)">
+            <van-image
+                :src="item.currentUrl"
+                fit="cover"
+                width="100%"
+                height="160"
+                :error-icon="defaultImg"
+                error-icon-size="48"
+            />
+          </div>
+        </div>
+      </div>
+
+      <!-- 空态 -->
+      <div class="empty-state" v-else>
+        <van-empty description="暂无损伤照片" />
+      </div>
+    </div>
+
+    <!-- 历史照片弹框 -->
+    <van-popup
+      v-model="historyShow"
+      position="bottom"
+      round
+      closeable
+      :style="{ height: '70%' }"
+      @closed="currentHistory = []"
+    >
+      <div class="history-popup">
+        <div class="history-title">历史照片</div>
+        <div class="history-list" v-if="currentHistory.length">
+          <div
+            class="history-item"
+            v-for="(item, index) in currentHistory"
+            :key="index"
+            @click="previewHistory(item.url)"
+          >
+            <van-image
+              :src="item.url"
+              fit="cover"
+              width="100%"
+              height="120"
+              :error-icon="defaultImg"
+              error-icon-size="48"
+            />
+            <div class="history-time" v-if="item.replaceTime">替换时间：{{ item.replaceTime }}</div>
+          </div>
+        </div>
+        <div class="history-empty" v-else>
+          <van-empty description="暂无历史照片" />
+        </div>
+      </div>
+    </van-popup>
+  </div>
+</template>
+
+<script>
+import { getDamagePhotos } from '@/api/damagePhoto'
+import { myMixins } from '@/utils/myMixins'
+import { ImagePreview, Toast } from 'vant'
+
+export default {
+  name: 'damagePhotoList',
+  mixins: [myMixins],
+  data() {
+    return {
+      loaded: false,
+      info: {
+        caseNo: '',
+        vehicleIdentity: '',
+        route: ''
+      },
+      photoList: [],
+      historyShow: false,
+      currentHistory: [],
+      defaultImg: require('@/assets/empty.png')
+    }
+  },
+  async mounted() {
+    await this.fetchDamagePhotos()
+  },
+  methods: {
+    async fetchDamagePhotos() {
+      const userOrderId = this.$route.query.userOrderId
+      const taskOrderId = this.$route.query.taskOrderId
+      if (!userOrderId || !taskOrderId) {
+        Toast('缺少必要参数')
+        this.loaded = true
+        return
+      }
+      Toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        duration: 0
+      })
+      try {
+        const res = await getDamagePhotos({
+          userOrderId: Number(userOrderId),
+          taskOrderId: Number(taskOrderId)
+        })
+        this.info = {
+          caseNo: res.data?.caseNo || '',
+          vehicleIdentity: res.data?.vehicleIdentity || '',
+          route: res.data?.route || ''
+        }
+        this.photoList = Array.isArray(res.data?.photos) ? res.data.photos : []
+      } finally {
+        Toast.clear()
+        this.loaded = true
+      }
+    },
+    previewCurrent(url) {
+      if (!url) return
+      ImagePreview({
+        images: [url],
+        startPosition: 0,
+        closeable: true
+      })
+    },
+    showHistory(item) {
+      this.currentHistory = Array.isArray(item.historyList) ? item.historyList : []
+      this.historyShow = true
+    },
+    previewHistory(url) {
+      if (!url) return
+      ImagePreview({
+        images: [url],
+        startPosition: 0,
+        closeable: true
+      })
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/styles/mixin.scss";
+@import "@/styles/common.scss";
+
+.wrap {
+  @include wh(100%, 100%);
+  background-color: #F4F5F7;
+  overflow-y: auto;
+}
+
+.navBar {
+  height: 46px;
+  ::v-deep .van-nav-bar--fixed {
+    z-index: 9999 !important;
+  }
+}
+
+.content-wrap {
+  padding: 10px 15px 20px;
+}
+
+.info-card {
+  background: #fff;
+  border-radius: 8px;
+  padding: 15px;
+  margin-bottom: 10px;
+
+  .info-item {
+    display: flex;
+    line-height: 24px;
+    font-size: 13px;
+
+    &:not(:last-child) {
+      margin-bottom: 8px;
+    }
+
+    .info-label {
+      color: rgba(0, 0, 0, 0.5);
+      width: 70px;
+      flex-shrink: 0;
+    }
+
+    .info-value {
+      color: #323643;
+      flex: 1;
+      word-break: break-all;
+    }
+  }
+}
+
+.photo-list {
+  .photo-card {
+    background: #fff;
+    border-radius: 8px;
+    padding: 12px 12px 15px;
+    margin-bottom: 10px;
+
+    .photo-title {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 14px;
+      font-weight: bold;
+      color: #323643;
+      margin-bottom: 10px;
+
+      .replaced-tag {
+        font-size: 12px;
+        font-weight: normal;
+        color: #fff;
+        background-color: #ee0a24;
+        padding: 2px 8px;
+        border-radius: 4px;
+      }
+    }
+
+    .photo-image {
+      width: 100%;
+      border-radius: 4px;
+      overflow: hidden;
+    }
+  }
+}
+
+.empty-state {
+  margin-top: 30px;
+}
+
+.history-popup {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+  .history-title {
+    font-size: 16px;
+    font-weight: bold;
+    color: #323643;
+    text-align: center;
+    padding: 15px 0;
+    border-bottom: 1px solid #E9E9EA;
+  }
+
+  .history-list {
+    flex: 1;
+    overflow-y: auto;
+    padding: 15px;
+
+    .history-item {
+      margin-bottom: 15px;
+      border-radius: 4px;
+      overflow: hidden;
+
+      .history-time {
+        font-size: 12px;
+        color: rgba(0, 0, 0, 0.5);
+        margin-top: 6px;
+      }
+    }
+  }
+
+  .history-empty {
+    flex: 1;
+  }
+}
+</style>
+
+<style>
+/* 确保图片预览及其遮罩层级高于底部弹框 */
+.van-image-preview {
+  z-index: 10000000003 !important;
+}
+.van-overlay.van-image-preview__overlay {
+  z-index: 10000000002 !important;
+}
+</style>

src/views/environmentPhoto/environmentPhotoList.vue

@@ -0,0 +1,118 @@
+<template>
+  <div class="wrap environment-photo-wrap">
+    <div v-if="loaded && photoList.length === 0" class="empty-tip">暂无环境照片</div>
+    <div v-for="(item, index) in photoList" :key="index" class="photo-item">
+      <div class="media-wrap">
+        <video
+          v-if="item.tag && item.tag.includes('video')"
+          :src="item.imageUrl"
+          controls
+          playsinline
+          class="media"
+        />
+        <img
+          v-else-if="item.tag && item.tag.includes('img')"
+          :src="item.imageUrl"
+          class="media"
+          @click="previewImage(index)"
+        />
+      </div>
+      <p v-if="item.title" class="photo-name">{{ item.title }}</p>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Toast, ImagePreview } from 'vant'
+import { getBeforeDispatchImage } from '@/api/environmentPhoto'
+
+export default {
+  name: 'EnvironmentPhotoList',
+  data() {
+    return {
+      photoList: [],
+      loaded: false
+    }
+  },
+  async mounted() {
+    await this.fetchPhotos()
+  },
+  methods: {
+    async fetchPhotos() {
+      const userOrderId = this.$route.query.userOrderId
+      if (!userOrderId) {
+        Toast('缺少必要参数')
+        this.loaded = true
+        return
+      }
+      Toast.loading({
+        message: '加载中...',
+        forbidClick: true,
+        duration: 0
+      })
+      try {
+        const res = await getBeforeDispatchImage({ userOrderId: Number(userOrderId) })
+        this.photoList = Array.isArray(res.data) ? res.data : []
+      } finally {
+        Toast.clear()
+        this.loaded = true
+      }
+    },
+    previewImage(index) {
+      const urls = this.photoList
+        .filter(item => item.tag && item.tag.includes('img'))
+        .map(item => item.imageUrl)
+      ImagePreview({ images: urls, startPosition: index })
+    }
+  }
+}
+</script>
+
+<style scoped>.wrap {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #F4F5F7;
+  overflow-y: auto;
+  -webkit-overflow-scrolling: touch;
+}
+
+.environment-photo-wrap {
+  padding: 12px;
+}
+.empty-tip {
+  text-align: center;
+  color: #999;
+  margin-top: 60px;
+  font-size: 14px;
+}
+.photo-item {
+  background: #fff;
+  border-radius: 6px;
+  margin-bottom: 12px;
+  overflow: hidden;
+}
+.media-wrap {
+  position: relative;
+  width: 100%;
+  padding-top: 56.25%;
+}
+.photo-item img,
+.photo-item video {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  display: block;
+  object-fit: cover;
+}
+.photo-name {
+  font-size: 13px;
+  color: #333;
+  padding: 8px 10px;
+  margin: 0;
+}
+</style>

src/views/goToApp/goToApp.vue

@@ -3,22 +3,57 @@
     <div class="content">
       <div class="goToBtn" @click="goAppHandler">立即打开</div>
       <div class="content_tip">
-        <div class="font_cls">如未安装请点击下载</div>
+        <div class="font_cls">如未安装，请点击 <span @click="downLoadHandler">立即下载</span></div>
-        <div class="font_cls">如已安装未自动跳转，请 <span @click="downLoadHandler">立即下载</span></div>
       </div>
     </div>
+
+    <!-- 微信内置浏览器引导 -->
+    <div v-if="showGuide" class="guide-mask" @click.self="closeGuide">
+      <img class="guide-img" src="@/assets/sucai.png" alt="引导在浏览器打开" />
+      <div class="guide-btn" @click="closeGuide">我知道了</div>
+    </div>
   </div>
 </template>
 
 <script>
-import { getNewVersion } from "@/api/order"
+import { getNewVersion, getLog } from "@/api/order"
 export default {
   name: "goToApp",
+  data() {
+    return {
+      showGuide: false
+    }
+  },
+  mounted() {
+    getLog({
+      source: 'App下载页',
+      event: '页面浏览',
+      page: '/h5/supplier/dispatch/goToApp'
+    })
+    this.showGuide = this.isWeixin()
+  },
   methods: {
+    isWeixin() {
+      const ua = navigator.userAgent.toLowerCase()
+      return ua.indexOf('micromessenger') !== -1
+    },
+    closeGuide() {
+      this.showGuide = false
+    },
     goAppHandler() {
+      getLog({
+        source: 'App下载页',
+        event: '直接打开',
+        page: '/h5/supplier/dispatch/goToApp'
+      })
       window.location.href = "rvdriver://page/pagesLogin/phoneLogin?source=h5Link";
     },
     async downLoadHandler() {
+      getLog({
+        source: 'App下载页',
+        event: '立即下载',
+        page: '/h5/supplier/dispatch/goToApp'
+      });
       getNewVersion({
         appType: 5
       }).then((res) => {
@@ -70,4 +105,32 @@ export default {
     }
   }
 }
+.guide-mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  z-index: 999;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  background: rgba(0, 0, 0, 0.85);
+}
+.guide-img {
+  width: 90%;
+  margin-top: 0;
+  object-fit: contain;
+}
+.guide-btn {
+  width: 140px;
+  height: 40px;
+  margin-top: 40px;
+  border: 1px solid #FFFFFF;
+  border-radius: 20px;
+  font-size: 15px;
+  color: #FFFFFF;
+  line-height: 40px;
+  text-align: center;
+}
 </style>

src/views/index/vehicleAdd.vue

@@ -20,6 +20,7 @@
     <van-uploader
       v-model="vehicleLicenseFrontList"
       :after-read="vehicleLicenseFrontHandler"
+      @delete="vehicleLicenseFrontDelete"
       @oversize="onOversize"
       :max-size="5 * 1024 * 1024"
       max-count="1"
@@ -35,6 +36,7 @@
     <van-uploader
       v-model="vehicleLicenseBackList"
       :after-read="vehicleLicenseBackHandler"
+      @delete="vehicleLicenseBackDelete"
       @oversize="onOversize"
       :max-size="5 * 1024 * 1024"
       max-count="1"
@@ -50,6 +52,7 @@
     <van-uploader
       v-model="vehicleLicenseCarPhotoList"
       :after-read="vehicleLicenseCarHandler"
+      @delete="vehicleLicenseCarPhotoDelete"
       @oversize="onOversize"
       :max-size="5 * 1024 * 1024"
       max-count="1"
@@ -65,6 +68,7 @@
     <van-uploader
       v-model="vehicleFrontPhotoList"
       :after-read="vehicleFrontPhotoHandler"
+      @delete="vehicleFrontPhotoDelete"
       @oversize="onOversize"
       :max-size="5 * 1024 * 1024"
       max-count="1"
@@ -104,6 +108,7 @@
         value-key="name"
         class="elSelect"
         collapse-tags="collapse-tags"
+        :popper-append-to-body="false"
         placeholder="请选择"  style="width: 55%"
     >
       <el-option
@@ -826,6 +831,19 @@ export default {
       this.vehicleFrontPhoto = res.data;
       await this.ocrCarFrontHandler()
     },
+    vehicleLicenseFrontDelete() {              // 删除 行驶证首页
+      this.vehicleLicenseFront = '';
+    },
+    vehicleLicenseBackDelete() {               // 删除 行驶证副页
+      this.vehicleLicenseBack = '';
+      this.vehicleLicenseBackOcrFlag = false;
+    },
+    vehicleLicenseCarPhotoDelete() {           // 删除 行驶证车辆照片
+      this.vehicleLicenseCarPhoto = '';
+    },
+    vehicleFrontPhotoDelete() {                // 删除 车头照
+      this.vehicleFrontPhoto = '';
+    },
     clickPreview(){
       console.log(' this.insurancePicturePhoto', this.insurancePicturePhoto)
       if(this.insurancePicturePhoto && this.insurancePicturePhoto.indexOf('.pdf') !== -1){
@@ -875,7 +893,7 @@ export default {
         this.vehicleLicenseInfo.address = frontInfo?.address;
         this.vehicleLicenseInfo.useNature = frontInfo?.useCharacter;
         this.vehicleLicenseInfo.model = frontInfo?.model;
-        this.vehicleLicenseInfo.vinCode = frontInfo?.vin;
+        this.vehicleLicenseInfo.vinCode = String(frontInfo?.vin || '').toUpperCase().replace(/O/g, '0');
         this.vehicleLicenseInfo.engineNumber = frontInfo?.engineNo;
         this.vehicleLicenseInfo.registrationDate = frontInfo?.registerDate;
         this.vehicleLicenseInfo.issueDate = frontInfo?.issueDate;
@@ -1219,7 +1237,8 @@ export default {
       this.insuranceChange=false
     },
     back() {
-      if( this.supplierId ) {
+      this.$router.back();
+      /*if( this.supplierId ) {
         this.$router.back();
       } else {
         this.$router.push({
@@ -1228,10 +1247,55 @@ export default {
             id: this.id
           }
         })
-      }
+      }*/
 
     },
+    validatePlateNumber(value) {
+      if (!value) {
+        return { valid: false, message: '请输入车牌号' }
+      }
+      const provinceList = ['京','津','冀','晋','蒙','辽','吉','黑','沪','苏','浙','皖','闽','赣','鲁','豫','鄂','湘','粤','桂','琼','渝','川','贵','云','藏','陕','甘','青','宁','新']
+      const firstChar = value.charAt(0)
+      if (!provinceList.includes(firstChar)) {
+        return { valid: false, message: '车牌号首位必须是省级简称（京/沪/津/渝/冀/晋/辽/吉/黑/苏/浙/皖/闽/赣/鲁/豫/鄂/湘/粤/琼/川/贵/云/陕/甘/青/蒙/桂/藏/宁/新）' }
+      }
+      if (!/^[\u4e00-\u9fa5][A-Z0-9]+$/.test(value)) {
+        return { valid: false, message: '车牌号只能包含汉字、字母和数字' }
+      }
+      if (![7, 8].includes(value.length)) {
+        return { valid: false, message: `车牌号必须为 7 位或 8 位（当前 ${value.length} 位）` }
+      }
+      return { valid: true, message: '' }
+    },
+    validateVinNo(value) {
+      const normalizedValue = String(value || '').toUpperCase()
+      if (!normalizedValue) {
+        return { valid: false, message: '车架号识别错误，请重新拍照上传。' }
+      }
+      if (!/^[A-NP-Z0-9]{17}$/.test(normalizedValue)) {
+        if (normalizedValue.includes('O')) {
+          return { valid: false, message: '车架号识别错误，请重新拍照上传。' }
+        }
+        if (!/^[A-NP-Z0-9]+$/.test(normalizedValue)) {
+          return { valid: false, message: '车架号识别错误，请重新拍照上传。' }
+        }
+        return { valid: false, message: `车架号识别错误，请重新拍照上传。` }
+      }
+      return { valid: true, message: '' }
+    },
     async submitBtn(){
+      const plateResult = this.validatePlateNumber(this.carNum)
+      if (!plateResult.valid) {
+        Dialog.alert({ message: plateResult.message })
+        return
+      }
+      const vinCode = String(this.vehicleLicenseInfo.vinCode || '')
+      const vinResult = this.validateVinNo(vinCode)
+      if (!vinResult.valid) {
+        Dialog.alert({ message: vinResult.message })
+        return
+      }
+      this.vehicleLicenseInfo.vinCode = vinCode
       if( !this.vehicleLicenseFront ) {
         this.$toast('行驶证主页照片不能为空')
         return
@@ -1378,6 +1442,9 @@ export default {
 }
 .navBar{
   margin-bottom: 46px;
+  ::v-deep .van-nav-bar--fixed {
+    z-index: 9999 !important;
+  }
 }
 .wrap{
 @include wh(100%,100%);

src/views/index/workOrderDetail.vue

@@ -96,6 +96,7 @@
         <div class="item" v-if="queryType == 9 || queryType ==11  || queryType ==12 || queryType ==5">
           <span class="leftTitle fontColor">工单照片:</span><span class="rightContent">
            <span  class="driverPoiBtn" @click="checkPhoto">查看照片</span>
+           <span  class="driverPoiBtn" v-if="orderDetailInfo.beforeDispatchImages && orderDetailInfo.beforeDispatchImages.length > 0" @click="environmentPhoto">环境照片</span>
           </span>
         </div>
       </div>
@@ -235,6 +236,12 @@ export default {
         window.android.sendMessage("orderPhoto,"+this.userOrderId+","+this.orderCode+","+this.taskOrderId+","+isAllowImage);
       }
     },
+    environmentPhoto() {
+      this.$router.push({
+        path: '/environmentPhotos',
+        query: { userOrderId: this.userOrderId }
+      })
+    },
     initMap() {
       this.map = new AMap.Map('container',{
         zoom:14,//级别(缩放比例 3-20 )

src/views/workOrder/accounting.vue

@@ -498,13 +498,7 @@ export default {
       console.log("ii", i)
     },
     goback() {
-      this.$router.push({
+      this.$router.back()
-        name: "workOrderReconciliation",
-        params: {
-          activeIndex: this.index,
-          queryTime: this.queryTime,
-        }
-      })
     },
     async compute() {
       if(this.orderInfo.contractSettleTypeString == '车主现收'){