Merge remote-tracking branch 'origin/yagwly_fa_master' into yagwly_fa_master

zhangback

2025-12-18 db8e73b120963810d6febdb939612db12d26996e

 ui/car_wx_app/pages/transportation/index.vue

@@ -221,6 +221,7 @@
import amap from '@/common/amap-wx.130.js'

import store from '@/store'
import {uploadImage} from "@/common/upload";
export default {
    data() {
        return {
@@ -264,7 +265,7 @@
                // odometer: [{ required: true, message: '请输入仪表里程', trigger: 'change' }],
                voucher: [{ required: true, message: '请上传凭证', trigger: 'blur' }]
            },

            isHk: false,
        };
    },
    onLoad(options) {
@@ -272,6 +273,7 @@
      this.amapPlugin = new amap.AMapWX({
        key: this.mapApiKey
      });
      this.getLocation();
        // 获取 URL 参数
        if (options.id) {
            this.getList();
@@ -371,27 +373,33 @@
        },
        // 新增图片
        async afterRead(event) {
            // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
            let lists = [].concat(event.file)
            let fileListLen = this.fileList.length
            lists.map((item) => {
                this.fileList.push({
                    ...item,
                    status: 'success',
                    message: '上传中'
                })
            })
            for (let i = 0; i < lists.length; i++) {

                const result = await this.uploadFilePromise(lists[i].url)
                let item = this.fileList[fileListLen]
                this.fileList.splice(fileListLen, 1, Object.assign(item, {
                    status: result.status,
                    message: result.status == 'success' ? '上传成功' : '上传失败',
                    urls: result.url
                }))
                fileListLen++
            }
          console.log(event)
          uploadImage(event.file[0].url,this.isHk).then(res=>{
            console.log(res)
                this.fileList.push(res);
          })
          // console.log(event)
          //   // 当设置 multiple 为 true 时, file 为数组格式，否则为对象格式
          //   let lists = [].concat(event.file)
          //   let fileListLen = this.fileList.length
          //   lists.map((item) => {
          //       this.fileList.push({
          //           ...item,
          //           status: 'success',
          //           message: '上传中'
          //       })
          //   })
          //   for (let i = 0; i < lists.length; i++) {
          //
          //       const result = await this.uploadFilePromise(lists[i].url)
          //       let item = this.fileList[fileListLen]
          //       this.fileList.splice(fileListLen, 1, Object.assign(item, {
          //           status: result.status,
          //           message: result.status == 'success' ? '上传成功' : '上传失败',
          //           urls: result.url
          //       }))
          //       fileListLen++
          //   }
        },

        uploadFilePromise(url) {
@@ -452,7 +460,7 @@

                    if (this.newForm.statusStr == '待甩挂') {

                        var urls = this.fileList.map(item => item.urls).join(',');
                        var urls = this.fileList.map(item => item.url).join(',');
                        this.form.voucherUrl = urls
                        this.form.dispatchOrderId = this.newForm.dispatchId
                        this.form.driverId = this.newForm.driverId
@@ -473,7 +481,7 @@

                    } else if (this.newForm.statusStr == '待接挂') {

                        var urls = this.fileList.map(item => item.urls).join(',');
                        var urls = this.fileList.map(item => item.url).join(',');
                        this.form.voucherUrl = urls
                        this.form.dispatchOrderId = this.newForm.dispatchId
                        this.form.driverId = this.newForm.driverId
@@ -541,7 +549,16 @@
        this.amapPlugin.getRegeo({
          location:`${longitude},${latitude}`,
          success: (data) => {
            this.form.address  = data[0].name;
            let datum = data[0];
            if (datum.regeocodeData){
              if (datum.regeocodeData.addressComponent){
                let province = datum.regeocodeData.addressComponent.province;
                this.isHk = province.indexOf("香港") != -1;
              }
            }


            this.form.address  = datum.name;
          },
          fail: (err) => {
            console.error("SDK调用失败:", err);