hurx 9 時間 前
コミット
a7213bfb56

+ 1 - 1
.env.production

@@ -15,7 +15,7 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
-VITE_APP_BASE_API = 'https://one.yoe365.com'
+VITE_APP_BASE_API = 'https://api1.yoe365.com'
 
 # 是否在打包时开启压缩,支持 gzip 和 brotli
 VITE_BUILD_COMPRESS = gzip

+ 4 - 0
src/api/order/orderDeliver/types.ts

@@ -176,6 +176,8 @@ export interface OrderDeliverForm extends BaseEntity {
 }
 
 export interface OrderDeliverQuery extends PageQuery {
+  id?: string | number;
+
   /**
    * 订单id
    */
@@ -252,4 +254,6 @@ export interface OrderDeliverQuery extends PageQuery {
    * 日期范围参数
    */
   params?: any;
+
+  logisticsCompanyCode?: string;
 }

+ 9 - 2
src/views/order/saleOrder/logisticsDetail.vue

@@ -82,6 +82,7 @@ const { deliver_method } = toRefs<any>(proxy?.useDict('deliver_method'));
 const visible = ref(false);
 const logisticsList = ref<OrderDeliverVO[]>([]);
 const form = ref({
+  id: null,
   selectedLogisticNo: ''
 });
 const logisticsInfo = ref<LogisticsInfo[]>([]);
@@ -111,19 +112,24 @@ const loadLogisticsList = async () => {
 
     if (logisticsList.value.length > 0) {
       form.value.selectedLogisticNo = logisticsList.value[0].logisticNo || logisticsList.value[0].deliverCode;
-      handleLogisticNoChange(form.value.selectedLogisticNo);
+      form.value.id = logisticsList.value[0].id;
+      handleLogisticNoChange(form.value.selectedLogisticNo, form.value.id);
     }
   } catch (error) {
     console.error('Failed to load logistics list:', error);
   }
 };
 
-const handleLogisticNoChange = async (logisticNo: string) => {
+const handleLogisticNoChange = async (logisticNo: string, id: string) => {
   const selected = logisticsList.value.find((item) => item.logisticNo === logisticNo);
   try {
     if (selected) {
       const res = await queryTrack({
+        id: form.value.id,
         logisticNo: logisticNo,
+        logisticsCompanyCode: selected.logisticsCompanyCode,
+        //先使用送货人手机号其实应该是收货人手机号
+        phone: selected.consigneePhone,
         pageNum: 1,
         pageSize: 100
       });
@@ -150,6 +156,7 @@ const handleLogisticNoChange = async (logisticNo: string) => {
       await listOrderStatusLog({
         orderId: props.orderId,
         logisticNos: form.value.selectedLogisticNo,
+        logisticsCompanyCode: selected?.logisticsCompanyCode,
         pageNum: 1,
         pageSize: 100
       }).then((res) => {