From aa109b612926cf8531309ec4313304d3bd107520 Mon Sep 17 00:00:00 2001
From: lxf <xunfeng1122@163.com>
Date: Fri, 4 Jul 2025 10:41:06 +0800
Subject: [PATCH] fix: 货源

---
 pages/global/search-address.vue  | 74 +++++++-------------------------------------------------------------------
 pages/goodSource/add.vue         |  7 ++++---
 pages/goodSource/detail.vue      | 72 +++++++++++++++++++++++++++++++++---------------------------------------
 pages/goodSource/grab-record.vue |  2 +-
 pages/order/add.vue              |  7 ++++---
 5 files changed, 49 insertions(+), 113 deletions(-)

diff --git a/pages/global/search-address.vue b/pages/global/search-address.vue
index 7a850c6..e09047a 100644
--- a/pages/global/search-address.vue
+++ b/pages/global/search-address.vue
@@ -30,6 +30,7 @@
 
 <script>
 import { urlParam } from '@/utils/param';
+import { formatLngLat } from '@/utils/format-value';
 
 export default {
   props: {
@@ -124,74 +125,13 @@ export default {
       wx.chooseLocation({
         latitude: this.lat ? Number(this.lat) : undefined,
         longitude: this.lng ? Number(this.lng) : undefined,
-      }).then(res => {
-        uni.request({
-          url: 'https://restapi.amap.com/v3/geocode/regeo', //逆地理编码接口地址。
-          data: {
-            key: '1b987a62e5685a58cda5933e1bc66044',
-            location: res.longitude + ',' + res.latitude,
-          },
-          success: response => {
-            console.info(response);
-            const regeocode = response?.data?.regeocode || {};
-            const addressComponent = regeocode?.addressComponent || {};
-            const addressInfo = this.getAddress(response?.data);
-            let location = {
-              lng: res.longitude || '',
-              lat: res.latitude || '',
-              provinceCode: addressComponent.pcode,
-              provinceName: addressComponent.pname,
-              areaCode: addressComponent.adcode,
-              areaName: addressComponent.district,
-              address: addressInfo.address,
-            };
-            this.onSelect(location, true);
-          },
+      })
+        .then(res => {
+          return formatLngLat({ lat: res.latitude, lng: res.longitude });
+        })
+        .then(location => {
+          this.onSelect(location, true);
         });
-        // let location = {
-        //   lng: res.longitude || '',
-        //   lat: res.latitude || '',
-        //   provinceCode: '',
-        //   provinceName: '',
-        //   cityCode: '',
-        //   cityName: '',
-        //   areaCode: '',
-        //   areaName: '',
-        //   address: res.address || '',
-        // };
-        // this.onSelect(location);
-      });
-      // uni.$once('webview-select', location => {
-      //   this.onSelect(location);
-      // });
-      // const url = 'https://zeyi-tms-product.oss-cn-hangzhou.aliyuncs.com/webview/location-wx-freight.html';
-      // const params = {
-      //   lat: this.lat ? Number(this.lat) : '',
-      //   lng: this.lng ? Number(this.lng) : '',
-      // };
-      // uni.navigateTo({ url: `/pages/common/webview?url=${url}&query=${JSON.stringify(params)}` });
-    },
-    // 格式化地址
-    getAddress(geo) {
-      const { regeocode = {} } = geo || {};
-      const { addressComponent = {} } = regeocode || {};
-      const { province, city, district, township, streetNumber } = addressComponent || {};
-      const { street, number } = streetNumber || {};
-      const formattedAddress = regeocode.formatted_address || regeocode.formattedAddress || '';
-      let amapAddress = formattedAddress.replace(province, '');
-      amapAddress = amapAddress.replace(city, '');
-      amapAddress = amapAddress.replace(district, '');
-      amapAddress = amapAddress.replace(township, '');
-      amapAddress = amapAddress.replace(street, '');
-      amapAddress = amapAddress.replace(number, '');
-      return {
-        formattedAddress,
-        fullAddress: `${province}${city}${district}${township}${street}${number}`,
-        address: `${township}${street}${number}${amapAddress}`,
-        amapAddress,
-        adcode: addressComponent.adcode,
-        township,
-      };
     },
   },
 };
diff --git a/pages/goodSource/add.vue b/pages/goodSource/add.vue
index 34c8c67..6af7700 100644
--- a/pages/goodSource/add.vue
+++ b/pages/goodSource/add.vue
@@ -383,11 +383,12 @@ export default {
       uni.$u.api.freightGoodsSourceV2[opType]({ ...this.form, ...startAddressObj, ...endAddressObj })
         .then(res => {
           if (res.success) {
-            uni.showToast({ title: '成功', icon: 'none' });
+            // uni.showToast({ title: '成功', icon: 'none' });
             this.getOpenerEventChannel().emit('refreshData');
-            setTimeout(() => uni.navigateBack(), 1000);
+            setTimeout(() => uni.navigateBack(), 500);
+          } else {
+            this.loading = false;
           }
-          this.loading = false;
         })
         .catch(e => {
           this.loading = false;
diff --git a/pages/goodSource/detail.vue b/pages/goodSource/detail.vue
index b08b4c9..1ed44ab 100644
--- a/pages/goodSource/detail.vue
+++ b/pages/goodSource/detail.vue
@@ -4,17 +4,33 @@
       <card :item="form" :onlyShow="true"></card>
       <view class="card">
         <view class="card__item">
-          <view class="card__item_field">货物名称</view>
+          <view class="card__item_field">货物类型</view>
           <view class="card__item_content">{{ form.goodsName || '' }}</view>
         </view>
-        <view class="card__item" v-if="form.goodsWeight">
-          <view class="card__item_field">货物总量</view>
-          <view class="card__item_content">{{ form.goodsWeight || '' }}</view>
-        </view>
-        <view class="card__item" v-if="form.remainGoodsWeight">
-          <view class="card__item_field">货物剩余</view>
-          <view class="card__item_content">{{ form.remainGoodsWeight || '' }}</view>
-        </view>
+        <template v-if="form.priceType === 'TON'">
+          <view class="card__item">
+            <view class="card__item_field">货物总量</view>
+            <view class="card__item_content">{{ form.goodsWeight || '' }}吨</view>
+          </view>
+          <view class="card__item">
+            <view class="card__item_field">货物剩余</view>
+            <view class="card__item_content">
+              <text>{{ form.remainGoodsWeight || '' }}吨</text>
+            </view>
+          </view>
+        </template>
+        <template v-if="form.priceType === 'VEHICLE'">
+          <view class="card__item">
+            <view class="card__item_field">需求车数</view>
+            <view class="card__item_content">{{ form.vehicleNumber || '' }}车</view>
+          </view>
+          <view class="card__item">
+            <view class="card__item_field">还需车数</view>
+            <view class="card__item_content">
+              <text>{{ form.remainVehicleNumber || '' }}车</text>
+            </view>
+          </view>
+        </template>
         <view class="card__item">
           <view class="card__item_field">司机抢单</view>
           <view class="card__item_content">
@@ -44,44 +60,22 @@
       </view>
       <view class="card">
         <view class="card__item">
-          <view class="card__item_field">需求车型</view>
-          <view class="card__item_content">{{ formatSpecification || '' }}</view>
-        </view>
-        <view class="card__item">
-          <view class="card__item_field">需求箱型</view>
-          <view class="card__item_content">{{ formatVanType || '' }}</view>
-        </view>
-      </view>
-      <view class="card">
-        <view class="card__item">
           <view class="card__item_field">装货地址</view>
           <view class="card__item_content"> {{ form.startProvinceName || '' }}{{ form.startCityName || '' }}{{ form.startAreaName || '' }}{{ form.startAddress || '' }} </view>
         </view>
         <view class="card__item">
-          <view class="card__item_field">司机抢单</view>
-          <view class="card__item_content">
-            <text>
-              已抢单<text class="color-blue">{{ form.biddingCount }}</text> /已指派<text class="color-red">{{ form.assignedCount }}</text> /待指派<text class="color-red">{{
-                form.waitAssignCount
-              }}</text>
-            </text>
-          </view>
-        </view>
-        <view class="card__item">
-          <view class="card__item_field">订单备注</view>
-          <view class="card__item_content">{{ form.remark || '' }}</view>
+          <view class="card__item_field">卸货地址</view>
+          <view class="card__item_content"> {{ form.endProvinceName || '' }}{{ form.endCityName || '' }}{{ form.endAreaName || '' }}{{ form.endAddress || '' }} </view>
         </view>
+      </view>
+      <view class="card">
         <view class="card__item">
-          <view class="card__item_field">货源联系人</view>
-          <view class="card__item_content">
-            <text>{{ form.contactUser || '' }} {{ form.contactMobile || '' }}</text>
-          </view>
+          <view class="card__item_field">需求车型</view>
+          <view class="card__item_content">{{ formatSpecification || '' }}</view>
         </view>
         <view class="card__item">
-          <view class="card__item_field">货源发布时间</view>
-          <view class="card__item_content">
-            <text>{{ form.releaseTime || '' }}</text>
-          </view>
+          <view class="card__item_field">需求箱型</view>
+          <view class="card__item_content">{{ formatVanType || '' }}</view>
         </view>
       </view>
       <view class="card">
diff --git a/pages/goodSource/grab-record.vue b/pages/goodSource/grab-record.vue
index 1d2e46b..3f90ac2 100644
--- a/pages/goodSource/grab-record.vue
+++ b/pages/goodSource/grab-record.vue
@@ -93,7 +93,7 @@
       <u-modal :show="cancelShow" title="取消原因" @cancel="cancelShow = false" @confirm="confirmCancel" show-cancel-button>
         <u-input v-model="cancelRemark" placeholder="取消原因"></u-input>
       </u-modal>
-      <popup-platenumber v-model="platenumberVisible" :plate="searchForm.vehicleCode" @cancel="platenumberVisible = false" @confirm="onPlatenumberSelect" />
+      <popup-platenumber :visible="platenumberVisible" v-model="searchForm.vehicleLicenseNum" @update:visible="e => (platenumberVisible = e)" @confirm="onPlatenumberSelect" />
     </template>
   </Page>
 </template>
diff --git a/pages/order/add.vue b/pages/order/add.vue
index a2e0e25..4a087f1 100644
--- a/pages/order/add.vue
+++ b/pages/order/add.vue
@@ -635,12 +635,13 @@ export default {
       addFun({ ...this.form, totalAmount, payeeId: this.payeeModel.driverId })
         .then(res => {
           if (res.success) {
-            this.form = {};
+            // this.form = {};
             uni.showToast({ title: '下单成功', icon: 'none' });
             this.getOpenerEventChannel().emit('refreshData');
-            setTimeout(() => uni.navigateBack(), 500);
+            setTimeout(() => uni.navigateBack(), 1500);
+          } else {
+            this.loading = false;
           }
-          this.loading = false;
         })
         .catch(e => {
           this.loading = false;
--
libgit2 0.21.0