From 96407c7a0292f452ec35927627fb84eb53628556 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B5=A9?= <15830956848@163.com> Date: Fri, 2 May 2025 17:32:03 +0800 Subject: [PATCH] 1.0.1 --- config/api.js | 7 +- pages/order/myOrder.vue | 204 ++++++++++++++++---- pages/order/orderDetail.vue | 45 ++++- pages/tabbar/home/template/tpl_activity.vue | 4 + pages/tabbar/user/my.vue | 4 +- utils/filters.js | 1 + utils/request.js | 15 +- 7 files changed, 225 insertions(+), 55 deletions(-) diff --git a/config/api.js b/config/api.js index d97fb1f4..6e191b91 100644 --- a/config/api.js +++ b/config/api.js @@ -4,8 +4,11 @@ */ // 开发环境 const dev = { - // common: "https://common-api.pickmall.cn", - // buyer: "https://buyer-api.pickmall.cn", + // common: "http://192.168.1.211:8890", + // buyer: "http://192.168.1.211:8888", + // vlog: "http://192.168.1.211:8099", + // web: "http://192.168.1.211:8099", + // seller: "http://192.168.1.211:8889", common: "http://43.143.227.203:8890", buyer: "http://43.143.227.203:8888", vlog: "http://43.143.227.203:8099", diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue index bdc3a02f..f0ec439a 100644 --- a/pages/order/myOrder.vue +++ b/pages/order/myOrder.vue @@ -1,33 +1,80 @@ @@ -114,8 +231,8 @@ export default { }, data() { return { - showcancel:false, - contenttitle:"请联系客服:03156198200", + showcancel: false, + contenttitle: "请联系客服:03156198200", lightColor: this.$lightColor, tabCurrentIndex: 0, //导航栏索引 navList: [ @@ -162,6 +279,13 @@ export default { orderList: [], pageNumber: 1, }, + { + state: 6, + text: "已退款", + loadStatus: "more", + orderList: [], + pageNumber: 1, + }, ], status: "", //接收导航栏状态 params: { @@ -178,7 +302,7 @@ export default { orderStatus: "WAIT_PAY", //代付款 }, { - orderStatus: "WAIT_SHIP",//待发货 + orderStatus: "WAIT_SHIP", //待发货 }, { orderStatus: "WAIT_ROG", //待收货 @@ -186,9 +310,13 @@ export default { { orderStatus: "COMPLETE", //已完成 }, + { orderStatus: "CANCELLED", //已取消 }, + { + orderStatus: "REFUNDED", //已退款 + }, ], cancelShow: false, //是否显示取消 orderSn: "", //ordersn @@ -213,8 +341,6 @@ export default { this.loadData(this.status); }, - - onLoad(options) { /** * 修复app端点击除全部订单外的按钮进入时不加载数据的问题 @@ -226,7 +352,6 @@ export default { if (status == 0) { this.loadData(status); } - }, watch: { @@ -243,16 +368,16 @@ export default { }, }, methods: { - + maging(val) { + this.contenttitle = "请先联系商家:" + val.mobile; + this.showcancel = true; + }, // 售后 - applyService(order){ - - + applyService(order) { uni.navigateTo({ - url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}` + url: `/pages/order/afterSales/afterSales?orderSn=${order.sn}`, }); - }, // 店铺详情 @@ -482,7 +607,6 @@ export default { * 重新购买 */ reBuy(order) { - console.log(order); return; uni.navigateTo({ url: diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue index 937d7e8a..0a6a7614 100644 --- a/pages/order/orderDetail.vue +++ b/pages/order/orderDetail.vue @@ -8,7 +8,30 @@ - + + + + 快递编号： + + {{ order.logisticsNo }} + + + + + 快递： + {{ order.logisticsName }} + + {{ logiList.traces[logiList.traces.length - 1].AcceptStation }} @@ -22,12 +45,16 @@ 券码： {{ order.verificationCode }} - + - + @@ -412,7 +439,15 @@ export default { orderSn: this.order.sn, num: this.order.goodsNum, }; - if (this.orderDetail.ste == 0) { + + if ( + (this.orderDetail.ste == 0 && + this.orderDetail.orderStatusValue == "已付款") || + (this.orderDetail.ste == 0 && + this.orderDetail.orderStatusValue == "待发货") || + (this.orderDetail.ste == 0 && + this.orderDetail.orderStatusValue == "待收货") + ) { createWithVerificatio(params).then((res) => { if (res.data.success) { this.code = res.data.result; diff --git a/pages/tabbar/home/template/tpl_activity.vue b/pages/tabbar/home/template/tpl_activity.vue index 00fe5331..e93b183b 100644 --- a/pages/tabbar/home/template/tpl_activity.vue +++ b/pages/tabbar/home/template/tpl_activity.vue @@ -15,6 +15,10 @@ .layout{ width: 100%; height: 100%; + img{ + width: 100%; + height: 100%; + } } \ No newline at end of file diff --git a/pages/tabbar/user/my.vue b/pages/tabbar/user/my.vue index f0e05769..78943c3a 100644 --- a/pages/tabbar/user/my.vue +++ b/pages/tabbar/user/my.vue @@ -192,11 +192,11 @@ export default { Promise.all([ getCouponsNum(), //优惠券 getFootprintNum(), //浏览数量 - getUserWallet(), //预存款 + // getUserWallet(), //预存款 ]).then((res) => { this.couponNum = res[0].data.result; this.footNum = res[1].data.result; - this.walletNum = res[2].data.result.memberWallet; + // this.walletNum = res[2].data.result.memberWallet; }); }, }, diff --git a/utils/filters.js b/utils/filters.js index 312ae57d..a4d2b726 100644 --- a/utils/filters.js +++ b/utils/filters.js @@ -198,6 +198,7 @@ export function orderStatusList(val) { COMPLETED: "已完成", COMPLETE: "已完成", TAKE: "待核验", + REFUNDED: "已退款", }; return orderStatusList[val]; } diff --git a/utils/request.js b/utils/request.js index 66692f6a..3b8cba57 100644 --- a/utils/request.js +++ b/utils/request.js @@ -30,7 +30,7 @@ function cleanStorage() { storage.setHasLogin(false); storage.setAccessToken(""); storage.setRefreshToken(""); - storage.setUuid("wzj666"); + storage.setUuid(""); storage.setUserInfo({}); // 清理vlog信息 storage.setVlogToken(""); @@ -66,7 +66,6 @@ let http = new Request(); http.setConfig((config) => { // 没有uuid创建 if (!storage.getUuid()) { - // storage.setUuid(uuid.v1()); storage.setUuid("wzj666"); } @@ -114,8 +113,7 @@ http.interceptors.request.use( } config.header = { ...config.header, - // uuid: storage.getUuid() || uuid.v1(), - uuid: 'wzj666', + uuid: "wzj666", }; return config; }, @@ -131,7 +129,6 @@ let requests = []; // 必须使用异步函数，注意 http.interceptors.response.use( async (response) => { - // console.log(isRefreshing) console.log(response) /* 请求之后拦截器。可以使用async await 做异步操作 */ // token存在并且token过期 @@ -149,12 +146,17 @@ http.interceptors.response.use( // } let token = storage.getAccessToken(); + if(response.statusCode === 408){ + cleanStorage(); + } if ( (token && response.statusCode === 403) || (token && response.data.status === 403) ) { + console.log('去刷tk1') if (!isRefreshing) { isRefreshing = true; + console.log('去刷tk2') //调用刷新token的接口 return refreshTokenFn(storage.getRefreshToken()) .then((res) => { @@ -207,7 +209,8 @@ http.interceptors.response.use( ) { if (response.data.message) { uni.showToast({ - title: response.data.message, + // title: response.data.message, + title: "请重试", icon: "none", duration: 1500, });