From 6ea50b824fd0257262120acd1d126c342cc59cec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=9D=E5=BF=83?= <13773726377@163.com>
Date: Thu, 9 Apr 2026 14:31:44 +0800
Subject: [PATCH] 1
---
src/pages.json | 6 +-
.../client/order/components/OrderItem.vue | 4 +-
src/pages/client/order/create.vue | 6 +-
src/pages/client/order/details.vue | 93 ++++++++++++++-----
src/pages/client/order/list.vue | 18 ++--
5 files changed, 88 insertions(+), 39 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 6e05749..e10c067 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -301,13 +301,13 @@
"style": {
"navigationBarTitleText": "申请售后"
}
- },
+ },
{
"path": "details",
"style": {
"navigationBarTitleText": "订单详情",
"usingComponents": {
- "pay-button-sdk": "tta5a3d31e3aecfb9b11://pay-button"
+ "pay-button": "tta5a3d31e3aecfb9b11://pay-button"
}
}
},
@@ -322,7 +322,7 @@
"style": {
"navigationBarTitleText": "商城订单",
"usingComponents": {
- "pay-button-sdk": "tta5a3d31e3aecfb9b11://pay-button"
+ "pay-button": "tta5a3d31e3aecfb9b11://pay-button"
}
}
},
diff --git a/src/pages/client/order/components/OrderItem.vue b/src/pages/client/order/components/OrderItem.vue
index 64926f5..adefb18 100644
--- a/src/pages/client/order/components/OrderItem.vue
+++ b/src/pages/client/order/components/OrderItem.vue
@@ -96,12 +96,12 @@
-
申请退款
-
+ -->
{
if (!isPrePay) {
uni.showLoading({
- title: "处理中",
+ title: "支付中",
mask: true,
});
}
@@ -264,13 +264,13 @@ export default {
createCartOrder(params)
.then((res) => {
- uni.hideLoading();
-
// Check if tt and requirePlugin are available
if (typeof tt !== "undefined" && tt.requirePlugin) {
try {
const plugin = tt.requirePlugin("lifeServicePlugin");
if (plugin && plugin.createOrder) {
+ // 先隐藏之前的loading，让插件显示自己的弹窗
+ uni.hideLoading();
// let res1 = {
// data: {
// businessLine: 1,
diff --git a/src/pages/client/order/details.vue b/src/pages/client/order/details.vue
index 4eae0b8..c0b5da7 100644
--- a/src/pages/client/order/details.vue
+++ b/src/pages/client/order/details.vue
@@ -345,27 +345,31 @@
-
+
-
- 立即退款
+
+
+
+
+
+ 立即退款
+
-
立即预约
@@ -766,14 +770,16 @@ export default {
},
// 立即支付
pay(data) {
- // uni.showLoading({
- // icon: "none",
- // title: "支付中",
- // mask: true,
- // });
+ uni.showLoading({
+ icon: "none",
+ title: "支付中",
+ mask: true,
+ });
// console.log(data,'-?')
const plugin = tt.requirePlugin('lifeServicePlugin');
+// 先隐藏loading，让插件显示自己的弹窗
+uni.hideLoading();
plugin.continueToPay({
orderId:data.douyin_order_id, // 内部订单号
// outOrderNo: "outOrderNo", // 外部订单号 2个订单号必填一个
@@ -781,9 +787,9 @@ plugin.continueToPay({
const { orderId, outOrderNo } = res;
console.log("success res", res);
console.log("orderId", orderId, "outOrderNo", outOrderNo);
+ this.getOrderDetail();
},
fail: (res) => {
- uni.hideLoading();
const { orderId, outOrderNo, errNo, errMsg, errLogId } = res;
if (errLogId) {
console.log("查询订单信息失败", errNo, errMsg, errLogId);
@@ -791,6 +797,10 @@ plugin.continueToPay({
if (orderId || outOrderNo) {
console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
}
+ uni.showToast({
+ title: errMsg || "支付失败",
+ icon: "none",
+ });
},
});
@@ -1347,10 +1357,27 @@ plugin.continueToPay({
.handle-btn.refund-btn {
border: 2rpx solid #ff19a0 !important;
background: transparent !important;
+ display: flex !important;
+ align-items: center !important;
+ justify-content: center !important;
+ position: relative;
+ overflow: hidden;
.btnColor {
color: #ff19a0 !important;
}
+
+ // 确保 pay-button 组件居中显示
+ ::v-deep pay-button {
+ display: flex !important;
+ align-items: center !important;
+ justify-content: center !important;
+ width: 100% !important;
+ height: 100% !important;
+ position: absolute !important;
+ top: 0 !important;
+ left: 0 !important;
+ }
}
// 最后一个按钮（立即预约）保持粉色背景白色文字样式
@@ -1371,6 +1398,22 @@ plugin.continueToPay({
flex: 1 !important;
min-width: 0 !important;
}
+
+ // 确保 pay-button 组件正确显示
+ ::v-deep pay-button {
+ display: block !important;
+ width: 100% !important;
+ height: 100% !important;
+ visibility: visible !important;
+ opacity: 1 !important;
+ }
+
+ // 确保组件内部所有元素都可见
+ ::v-deep pay-button * {
+ display: block !important;
+ visibility: visible !important;
+ opacity: 1 !important;
+ }
}
.contact-float-btn {
diff --git a/src/pages/client/order/list.vue b/src/pages/client/order/list.vue
index 48efdc8..3865fb1 100644
--- a/src/pages/client/order/list.vue
+++ b/src/pages/client/order/list.vue
@@ -303,14 +303,16 @@ export default {
},
// 支付
pay(data) {
- // uni.showLoading({
- // icon: "none",
- // title: "支付中",
- // mask: true,
- // });
+ uni.showLoading({
+ icon: "none",
+ title: "支付中",
+ mask: true,
+ });
console.log(data,'-?')
const plugin = tt.requirePlugin('lifeServicePlugin');
+// 先隐藏loading，让插件显示自己的弹窗
+uni.hideLoading();
plugin.continueToPay({
orderId:data.douyin_order_id, // 内部订单号
// outOrderNo: "outOrderNo", // 外部订单号 2个订单号必填一个
@@ -318,9 +320,9 @@ plugin.continueToPay({
const { orderId, outOrderNo } = res;
console.log("success res", res);
console.log("orderId", orderId, "outOrderNo", outOrderNo);
+ this.reloadData();
},
fail: (res) => {
- uni.hideLoading();
const { orderId, outOrderNo, errNo, errMsg, errLogId } = res;
if (errLogId) {
console.log("查询订单信息失败", errNo, errMsg, errLogId);
@@ -328,6 +330,10 @@ plugin.continueToPay({
if (orderId || outOrderNo) {
console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
}
+ uni.showToast({
+ title: errMsg || "支付失败",
+ icon: "none",
+ });
},
});
// payOrder({