diff --git a/src/api/shop.js b/src/api/shop.js
index 0175a42..977ed2e 100644
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -157,14 +157,12 @@ export const createOrder = ({
};
// 创建抖音订单
-export const createCartOrder = ({
- product_pic= "",
-}) => {
+export const createCartOrder = ({ id }) => {
return request({
url: CREATE_CART_ORDER,
method: "post",
data: {
- orderId
+ id
},
});
};
diff --git a/src/api/url.js b/src/api/url.js
index a33528e..bec656a 100644
--- a/src/api/url.js
+++ b/src/api/url.js
@@ -58,7 +58,7 @@ export const CANCEL_PET_ORDER = '/order/pet/cancel'
// 取消商城接口
-export const CANCEL_MALL_ORDER = '/product/order/cancel'
+export const CANCEL_MALL_ORDER = '/douyin/goods/order/cancel'
// 卡包列表接口
export const USER_HolderList = '/membership/instances'
diff --git a/src/components/RefundButton.vue b/src/components/RefundButton.vue
deleted file mode 100644
index f2765dd..0000000
--- a/src/components/RefundButton.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-
-
-
-
- 退款
-
-
-
-
-
-
-
-
diff --git a/src/pages.json b/src/pages.json
index 530d9f3..6e05749 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -1,5 +1,13 @@
{
"easycom": {},
+ "ttPlugins": {
+ "dependencies": {
+ "tta5a3d31e3aecfb9b11": {
+ "version": "0.0.51",
+ "isDynamic": false
+ }
+ }
+ },
"pages": [
{
"path": "pages/client/index/index",
@@ -299,8 +307,7 @@
"style": {
"navigationBarTitleText": "订单详情",
"usingComponents": {
- "refund-button": "plugin://myTradePlugin/pay-button",
- "pay-button-sdk": "plugin://myTradePlugin/pay-button"
+ "pay-button-sdk": "tta5a3d31e3aecfb9b11://pay-button"
}
}
},
@@ -315,7 +322,7 @@
"style": {
"navigationBarTitleText": "商城订单",
"usingComponents": {
- "pay-button-sdk": "plugin://myTradePlugin/pay-button"
+ "pay-button-sdk": "tta5a3d31e3aecfb9b11://pay-button"
}
}
},
diff --git a/src/pages/client/order/components/OrderItem.vue b/src/pages/client/order/components/OrderItem.vue
index 09cb226..e8a9ca6 100644
--- a/src/pages/client/order/components/OrderItem.vue
+++ b/src/pages/client/order/components/OrderItem.vue
@@ -65,33 +65,13 @@
-
+
-
-
-
-
-
+ 申请退款
+
+
立即预约
@@ -155,7 +135,6 @@
\ No newline at end of file
diff --git a/src/pages/client/order/details.vue b/src/pages/client/order/details.vue
index ecd93f2..0cc3a31 100644
--- a/src/pages/client/order/details.vue
+++ b/src/pages/client/order/details.vue
@@ -263,13 +263,20 @@
-
+
-
@@ -344,7 +351,6 @@
import SliverInfo from "./components/SliverInfo.vue";
import CallModal from "@/components/petOrder/call-modal.vue";
import DraggableContact from "@/components/DraggableContact.vue";
-import RefundButton from "@/components/RefundButton.vue";
import {
walletTransaction,
cancelPetOrderRefund,
@@ -391,8 +397,7 @@ import {
SuccessModal,
SliverInfo,
CallModal,
- DraggableContact,
- RefundButton
+ DraggableContact
},
data() {
return {
diff --git a/src/pages/client/order/list.vue b/src/pages/client/order/list.vue
index 6498895..7e27b1a 100644
--- a/src/pages/client/order/list.vue
+++ b/src/pages/client/order/list.vue
@@ -9,7 +9,7 @@
@@ -250,7 +250,7 @@ export default {
mask: true,
});
const data = {
- order_id: this.orderInfo.order_id,
+ id: this.orderInfo.order_id,
// business_type:1
}
@@ -308,37 +308,58 @@ export default {
title: "支付中",
mask: true,
});
- payOrder({
- type: 4,
- total_fee: Number(data.actual_price),
- order_id: data.order_id,
- order_no: data.order_no
- }).then((res) => {
- tt.pay({
- orderInfo: {
- order_id:res.data.orderInfo.order_id,
- order_token:res.data.orderInfo.order_token,
- },
- service:5,
- success: (res) => {
- uni.hideLoading();
- uni.showToast({
- title: "支付成功",
- icon: "none",
- });
- this.additionalBom = false,
- this.elasticLayer = false,
- this.reloadData();
- },
- fail: (err) => {
- uni.hideLoading();
- uni.showToast({
- title: err?.msg || "支付失败",
- icon: "none",
- });
- },
- });
- });
+
+const plugin = tt.requirePlugin('tta5a3d31e3aecfb9b11');
+plugin.continueToPay({
+ orderId: "orderId", // 内部订单号
+ outOrderNo: "outOrderNo", // 外部订单号 2个订单号必填一个
+ success: (res) => {
+ const { orderId, outOrderNo } = res;
+ console.log("success res", res);
+ console.log("orderId", orderId, "outOrderNo", outOrderNo);
+ },
+ fail: (res) => {
+ uni.hideLoading();
+ const { orderId, outOrderNo, errNo, errMsg, errLogId } = res;
+ if (errLogId) {
+ console.log("查询订单信息失败", errNo, errMsg, errLogId);
+ }
+ if (orderId || outOrderNo) {
+ console.log("支付失败", errNo, errMsg, orderId, outOrderNo);
+ }
+ },
+});
+ // payOrder({
+ // type: 4,
+ // total_fee: Number(data.actual_price),
+ // order_id: data.order_id,
+ // order_no: data.order_no
+ // }).then((res) => {
+ // tt.pay({
+ // orderInfo: {
+ // order_id:res.data.orderInfo.order_id,
+ // order_token:res.data.orderInfo.order_token,
+ // },
+ // service:5,
+ // success: (res) => {
+ // uni.hideLoading();
+ // uni.showToast({
+ // title: "支付成功",
+ // icon: "none",
+ // });
+ // this.additionalBom = false,
+ // this.elasticLayer = false,
+ // this.reloadData();
+ // },
+ // fail: (err) => {
+ // uni.hideLoading();
+ // uni.showToast({
+ // title: err?.msg || "支付失败",
+ // icon: "none",
+ // });
+ // },
+ // });
+ // });
// this.additionalBom = true;
// this.elasticLayer = true;
@@ -499,6 +520,16 @@ export default {
this.cancelModalContent = "确定要退款吗？";
this.orderInfo = data;
},
+ // 处理从 OrderItem 传来的退款事件
+ handleRefundFromItem(data) {
+ // 跳转到订单详情页处理退款，因为插件组件只能在页面中使用
+ uni.navigateTo({
+ url: `/pages/client/order/details?id=${data?.order_id}`,
+ events: {
+ refreshData: () => this.reloadData(),
+ },
+ });
+ },
// 联系客服按钮点击 - 使用自定义弹窗（与首页在线客服功能一致）
handleContactBtnClick() {
console.log('[list.vue] handleContactBtnClick called')