diff --git a/api/index.js b/api/index.js index fa4434f..72dee5f 100644 --- a/api/index.js +++ b/api/index.js @@ -4,8 +4,8 @@ */ // 基础URL配置(注意:末尾不要加斜杠) -const BASE_URL = 'https://guangsh.manage.hschengtai.com' - +// const BASE_URL = 'https://guangsh.manage.hschengtai.com' +const BASE_URL = 'http://192.168.5.134:48085' // 是否正在刷新token(防止并发刷新) let isRefreshing = false // 等待刷新完成的请求队列 diff --git a/pages/detail/serviceDetail.vue b/pages/detail/serviceDetail.vue index 5c53964..d8fac4a 100644 --- a/pages/detail/serviceDetail.vue +++ b/pages/detail/serviceDetail.vue @@ -380,7 +380,8 @@ export default { couponMap.forEach((couponList, couponId) => { console.log(`优惠券ID:${couponId}`); console.log(`优惠券列表:`, couponList); - bodyStr = bodyStr + couponList[0].couponName + 'x' + couponList.length + ';'; + const name = couponList[0] && couponList[0].couponName ? couponList[0].couponName : "商品"; + bodyStr = bodyStr + name + 'x' + couponList.length + ';'; }); const randomstr = Math.floor(Math.random() * 10000000) + ""; @@ -393,9 +394,9 @@ export default { let params = { appid: "00390105", // 平台分配的appid body: bodyStr, // - cusid: "56479107531MPMN", // 平台分配的商户号 + cusid: order.tlPayCusid, // 平台分配的商户号 notify_url: - "http://e989c692.natappfree.cc/admin-api/member/lu-order/tlNotice", // 保持原值不变 + "https://guangsh.manage.hschengtai.com/admin-api/member/lu-order/tlNotice", // 保持原值不变 orgid: "56479107392N35H", paytype: "W06", randomstr: randomstr, @@ -404,10 +405,10 @@ export default { reqsn: order.orderNumber, sign: "", signtype: "RSA", - trxamt, + trxamt: "1", version: "12", }; - + console.log(params) if (order.orderNumber) { uni.setStorageSync("lastOrderNumber", order.orderNumber); } diff --git a/pages/profileSub/serviceRecords.vue b/pages/profileSub/serviceRecords.vue index 3bd3bc3..68af6fa 100644 --- a/pages/profileSub/serviceRecords.vue +++ b/pages/profileSub/serviceRecords.vue @@ -17,12 +17,12 @@ :class="{ active: currentTab === 'pending_verification' }" @click="switchTab('pending_verification')" > - 待核销 + 已完成 已退款 @@ -115,7 +115,7 @@ - +