From b2242ba20ba126f788893391021458af9a696f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=A7=A6=E6=98=9F=E6=98=9F?= <605893810@qq.com> Date: Thu, 10 Sep 2026 18:06:49 +0800 Subject: [PATCH] =?UTF-8?q?fixbug:=20=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98&=E6=9B=B4=E6=8D=A2=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 2 +- pages/mine_package/mine_purse/mine_purse.vue | 12 +- .../order_submit/order_submit.vue | 220 +++++++++--------- 3 files changed, 120 insertions(+), 114 deletions(-) diff --git a/manifest.json b/manifest.json index 7049cdc..bc97ca3 100644 --- a/manifest.json +++ b/manifest.json @@ -63,7 +63,7 @@ "urltypes" : [ { "urlidentifier" : "com.trustbridgeapp.mm", - "urlschemes" : [ "trustbridgeapp" ] + "urlschemes" : "trustbridgeapp" } ], "associatedDomains" : [ "applinks:ulink.trustbridgeapp.com" ], diff --git a/pages/mine_package/mine_purse/mine_purse.vue b/pages/mine_package/mine_purse/mine_purse.vue index c1f5105..2764d33 100644 --- a/pages/mine_package/mine_purse/mine_purse.vue +++ b/pages/mine_package/mine_purse/mine_purse.vue @@ -4,12 +4,12 @@ - + {{ item.name }} + bgColor="#f1f6ff00" /> @@ -34,10 +34,10 @@ {{ item.bonusAmount || 0 }} - + 消费者权益 - + @@ -655,7 +655,7 @@ export default { .tip_popup_btn { width: 100%; height: 84rpx; - background: #707070; + background: #7934F6; border-radius: 42rpx; display: flex; align-items: center; diff --git a/pages/order_package/order_submit/order_submit.vue b/pages/order_package/order_submit/order_submit.vue index 4e943e0..da1aa27 100644 --- a/pages/order_package/order_submit/order_submit.vue +++ b/pages/order_package/order_submit/order_submit.vue @@ -218,11 +218,16 @@ - + + + + {{ item.name }} - 仅 App 支持 + 仅 App + 支持 {{ item.name }} @@ -613,6 +618,7 @@ export default { parmas.types = douyinPayTypes(parmas.types); + console.log("支付的入口", parmas.types) const result = await getSupportPay(parmas); if (result && result.bizcode === 100) { const data = filterDouyinPayWays(result.data); @@ -637,7 +643,7 @@ export default { ); // #endif - console.log("getWayOption", this.wayOption); + console.log("getWayOption", result.data, this.wayOption); } }, async getOrder(couponUserId) { @@ -968,7 +974,7 @@ export default { return (this.tipsShow = true); } - console.log("orderInfo----", arr); + console.log("orderInfo---11-", arr); if (arr.length) { if (this.isCoupon) { this.show = true; @@ -985,120 +991,120 @@ export default { if (this._paySubmitting) return; this._paySubmitting = true; try { - if (!await prepareDouyinPay(this.orderInfo.paymentMethod)) return; - let params = { - addrId: this.orderInfo.address.id, // 收货地址ID - //结算的购物车ID,多个以逗号分割,ALL表示全选 - payway: this.orderInfo.paymentMethod, // 支付方式:1-微信,2-支付宝 - remark: JSON.stringify(this.getRemark()), //备注信息'[{"sid":"店铺ID","rmk":"备注内容"},{"sid":"店铺ID","rmk":"备注内容"}]' - }; + if (!await prepareDouyinPay(this.orderInfo.paymentMethod)) return; + let params = { + addrId: this.orderInfo.address.id, // 收货地址ID + //结算的购物车ID,多个以逗号分割,ALL表示全选 + payway: this.orderInfo.paymentMethod, // 支付方式:1-微信,2-支付宝 + remark: JSON.stringify(this.getRemark()), //备注信息'[{"sid":"店铺ID","rmk":"备注内容"},{"sid":"店铺ID","rmk":"备注内容"}]' + }; - if (params.payway == "wechat") { - // #ifdef MP-WEIXIN - params["payway"] = "wechatMiniProgram"; - params["code"] = await new Promise((resolve) => { - uni.login({ - provider: "weixin", - onlyAuthorize: true, - success: function (loginRes) { - resolve(loginRes.code); - }, - fail: (err) => { - resolve(""); // 登录失败时返回空字符串,避免后续流程中断 - }, + if (params.payway == "wechat") { + // #ifdef MP-WEIXIN + params["payway"] = "wechatMiniProgram"; + params["code"] = await new Promise((resolve) => { + uni.login({ + provider: "weixin", + onlyAuthorize: true, + success: function (loginRes) { + resolve(loginRes.code); + }, + fail: (err) => { + resolve(""); // 登录失败时返回空字符串,避免后续流程中断 + }, + }); }); - }); - // #endif - } - - console.log("收货地址ID--params", params); - - let resp = null; - console.log("orderInfo----", this.sed, this.orderInfo); - if (this.sed) { - if ( - this.orderInfo.paymentMethod == "balance" || - this.orderInfo.paymentMethod == "redpacket" || - this.isCoupon - ) { - params["password"] = CryptoJS.MD5(this.payPwd).toString(); + // #endif } - params["goodsId"] = this.sed.id; - params["specsId"] = this.sed.specsId.id; - params["goodsNum"] = this.orderInfo.shops[0].addrTimes[0].goods[0].num; + console.log("收货地址ID--params", params); - console.log("秦星星params-----", this.sed?.activedType); - if (this.sed?.activedType == "seckill") { - params["activityId"] = Number(this.sed?.activityId); // 秒杀活动ID - resp = await setSeckillOrder(params); - } else { - if (this.isCoupon) { - params.payway2 = "vcoin"; - resp = await settlementOrder(params); - } else { - // params["cartIds"] = this.ids; - if ( - this.orderInfo.paymentMethod == "balance" || - this.orderInfo.paymentMethod == "redpacket" - ) { - params["password"] = CryptoJS.MD5(this.payPwd).toString(); - } - if (this.selectedCoupon) { - params["couponUserId"] = this.getCouponUserId(this.selectedCoupon); - } - resp = await settle(params); + let resp = null; + console.log("orderInfo--22--", this.sed, this.orderInfo); + if (this.sed) { + if ( + this.orderInfo.paymentMethod == "balance" || + this.orderInfo.paymentMethod == "redpacket" || + this.isCoupon + ) { + params["password"] = CryptoJS.MD5(this.payPwd).toString(); } + params["goodsId"] = this.sed.id; + params["specsId"] = this.sed.specsId.id; + params["goodsNum"] = this.orderInfo.shops[0].addrTimes[0].goods[0].num; - // resp = await settle(params); - } - } else { - params["cartIds"] = this.ids; - if ( - this.orderInfo.paymentMethod == "balance" || - this.orderInfo.paymentMethod == "redpacket" - ) { - params["password"] = CryptoJS.MD5(this.payPwd).toString(); - } - if (this.selectedCoupon) { - params["couponUserId"] = this.getCouponUserId(this.selectedCoupon); - } - console.log("秦星星----2", params); - resp = await settle(params); - } - console.log("getWayOption", resp); + console.log("秦星星params-----", this.sed?.activedType); + if (this.sed?.activedType == "seckill") { + params["activityId"] = Number(this.sed?.activityId); // 秒杀活动ID + resp = await setSeckillOrder(params); + } else { + if (this.isCoupon) { + params.payway2 = "vcoin"; + resp = await settlementOrder(params); + } else { + // params["cartIds"] = this.ids; + if ( + this.orderInfo.paymentMethod == "balance" || + this.orderInfo.paymentMethod == "redpacket" + ) { + params["password"] = CryptoJS.MD5(this.payPwd).toString(); + } + if (this.selectedCoupon) { + params["couponUserId"] = this.getCouponUserId(this.selectedCoupon); + } + resp = await settle(params); + } - // 提交订单成功,就唤起支付 - if (resp && resp.bizcode === 100) { - console.log("提交订单成功", resp.data); - const item = resp.data; - if (item.status === 1) { - jumpWayOk(); - return; - } - if (item.douyin) { - await appDypayFun(item); - } else if (item.wechat && Object.keys(item.wechat).length !== 0) { - this.appWxpay(item.wechat, item.orderId, item.orderNum); - } else if ( - item.alipay && - Object.keys(item.alipay).length !== 0 && - item.alipay - ) { - this.zfbPay(item.alipay, item.orderId, item.orderNum); + // resp = await settle(params); + } } else { - this.$refs.uToastRef.show({ - type: "error", - message: "订单支付失败", - }); - setTimeout(() => { - jumpWayError(); - }, 2000); + params["cartIds"] = this.ids; + if ( + this.orderInfo.paymentMethod == "balance" || + this.orderInfo.paymentMethod == "redpacket" + ) { + params["password"] = CryptoJS.MD5(this.payPwd).toString(); + } + if (this.selectedCoupon) { + params["couponUserId"] = this.getCouponUserId(this.selectedCoupon); + } + console.log("秦星星----2", params); + resp = await settle(params); + } + + console.log("getWayOption", resp); + + // 提交订单成功,就唤起支付 + if (resp && resp.bizcode === 100) { + console.log("提交订单成功", resp.data); + const item = resp.data; + if (item.status === 1) { + jumpWayOk(); + return; + } + if (item.douyin) { + await appDypayFun(item); + } else if (item.wechat && Object.keys(item.wechat).length !== 0) { + this.appWxpay(item.wechat, item.orderId, item.orderNum); + } else if ( + item.alipay && + Object.keys(item.alipay).length !== 0 && + item.alipay + ) { + this.zfbPay(item.alipay, item.orderId, item.orderNum); + } else { + this.$refs.uToastRef.show({ + type: "error", + message: "订单支付失败", + }); + setTimeout(() => { + jumpWayError(); + }, 2000); + } + } else { + this.getOrder(); } - } else { - this.getOrder(); - } } catch (error) { uni.showToast({ title: error.message || error.msg || '支付请求失败,请查看订单后重试', icon: 'none' }); } finally { this._paySubmitting = false; }