From 3dc5c52690a8483a973ff3abe120bd359c82b547 Mon Sep 17 00:00:00 2001
From: dongjian <315328220@qq.com>
Date: Wed, 17 Sep 2025 17:24:59 +0800
Subject: [PATCH] no message
---
api/order.js | 8 ++
pages.json | 7 +
pages/mine_package/mine_order/mine_order.vue | 106 +++++++++++----
pages/rwa_package/setting/account-safe.vue | 34 ++++-
pages/rwa_package/setting/express.vue | 131 +++++++++++++++++++
utils/config.js | 4 +-
6 files changed, 261 insertions(+), 29 deletions(-)
create mode 100644 pages/rwa_package/setting/express.vue
diff --git a/api/order.js b/api/order.js
index 842568e..93c83b1 100644
--- a/api/order.js
+++ b/api/order.js
@@ -1,5 +1,13 @@
import request from '@/utils/request.js'; // 引入封装的方法
+export function orderLogistics(params) {
+ // params.appId = APPID;
+ return request({
+ url: "/order/getOrderLogistics",
+ method: "get",
+ data: params,
+ });
+}
/**
* 查询订单列表
* @param {Object} params
diff --git a/pages.json b/pages.json
index ad2d62b..dbd2c58 100644
--- a/pages.json
+++ b/pages.json
@@ -265,6 +265,13 @@
"navigationBarTextStyle": "black"
}
},
+ {
+ "path": "setting/express",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "shop/you-shop",
"style": {
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index 9c61e07..9cb0457 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -59,26 +59,26 @@
x{{ pItem.buyNum }}
-
-
- 运单号：
- （{{ pItem.expressName }}）
- {{ pItem.expressNo }}
+
+
+
+ {{pItem.expressData.logisticsStatusDesc}}
+ {{pItem.expressData.logisticsTraceDetailList[0].desc}}
-
+
-
- (快递动态跟进请复制单号至[快递100官网] 查询)
+
+ 共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}
确认收货
+
+
+ 查看物流
+
+
{
+ this.loadData();
+ })
// 待收货判断是否签署
if (
this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE ||
@@ -368,7 +377,13 @@ export default {
getValue,
formatDate1,
copyData,
-
+ onExpress(itemId){
+ console.log('onExpress',itemId)
+ // let expressId =
+ uni.navigateTo({
+ url:`/pages/rwa_package/setting/express?id=${itemId}`
+ })
+ },
onNextRefund() {
this.salesServer = 2;
@@ -542,18 +557,21 @@ export default {
}
try {
// 模拟异步获取数据，实际应用中应该替换为你的数据获取逻辑，例如API调用
- const newData = await this.fetchData(
- this.form.page,
- this.form.pageSize
- );
- if (newData.entitys && newData.entitys.length !== 0) {
- this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
- this.form.page++; // 页码加1
- console.log("this.orderList", this.orderList);
- }
+ const newData = await this.fetchData(
+ this.form.page,
+ this.form.pageSize
+ );
+ if (newData.entitys && newData.entitys.length !== 0) {
+ this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
+ this.form.page++; // 页码加1
+ console.log("this.orderList", this.orderList);
+ }
+
} catch (error) {
console.error("加载数据失败:", error);
} finally {
+ console.log("this.orderList1111",JSON.parse(JSON.stringify(this.orderList)));
+ this.$forceUpdate();
this.loading = false; // 设置加载状态为false
}
},
@@ -569,11 +587,41 @@ export default {
}
const data = await getOrderList(params);
if (data && data.bizcode === 100) {
+ for(let i=0;i{
+ // if(item.items.length){
+ // item.items.forEach(async (Iitem)=>{
+ // if(Iitem.expressNo){
+ // Iitem.expressData = await this.getOrderLogistics(Iitem.expressNo);
+ // }
+ // })
+ // }
+ // })
+
return data.data;
} else {
- return [];
+ return '';
}
},
+ async getOrderLogistics(id){
+ const params = {
+ mailNo:id
+ };
+
+ const data = await orderLogistics(params);
+ if(data.bizcode == 100){
+ return data.data;
+ }else{
+ return [];
+ }
+
+ },
// 当滚动到底部时触发的方法
loadMore() {
this.loadData(); // 加载更多数据
@@ -726,6 +774,16 @@ export default {
diff --git a/utils/config.js b/utils/config.js
index 7e63461..c78487b 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,9 +2,9 @@
// export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
// export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
-export const BASE_URL = "https://api.tbmall.xin"; //生产
+// export const BASE_URL = "https://api.tbmall.xin"; //生产
// export const BASE_URL ='http://api.hm.a-d.work:6880' // 测试
-// export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试
+export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试