diff --git a/src/bundle/order/douyin/douyin-order-detail.vue b/src/bundle/order/douyin/douyin-order-detail.vue
index 5740569..34dfe4e 100644
--- a/src/bundle/order/douyin/douyin-order-detail.vue
+++ b/src/bundle/order/douyin/douyin-order-detail.vue
@@ -92,7 +92,7 @@
- 立即预定
+ 立即预定
@@ -137,7 +137,7 @@
// 跳转到套餐详情
handleToCombo: () => {
-
+ router.navigateTo(`/bundle/tea-room/room?id=${order.value.store.id}&type=${order.value.store.operation_type}`)
},
// 跳转到包间详情
diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index 5465405..ffba470 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -86,9 +86,13 @@
-
+
+
+ 立即预定
+
+
@@ -310,7 +314,7 @@
},
/**
- * 使用套餐
+ * 使用套餐(抖音、团购，都跳转到对应的页面)
*/
handleUsePackage: (store_id: number, operation_type: number) => {
router.navigateTo(`/bundle/tea-room/room?id=${store_id}&type=${operation_type}`)
diff --git a/src/pages.json b/src/pages.json
index 36c53c2..228da46 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -269,6 +269,7 @@
{
"path": "tea-room/choose-room-reserve",
"type": "page",
+ "needLogin": true,
"layout": "tabbar",
"style": {
"navigationStyle": "custom"
@@ -277,6 +278,7 @@
{
"path": "tea-room/choose-room",
"type": "page",
+ "needLogin": true,
"layout": "tabbar",
"style": {
"navigationStyle": "custom"
diff --git a/src/pages/cashier/cashier.vue b/src/pages/cashier/cashier.vue
index f5df283..29e4172 100644
--- a/src/pages/cashier/cashier.vue
+++ b/src/pages/cashier/cashier.vue
@@ -278,29 +278,39 @@
router.navigateBack(1, 500)
} else if (pay.value == PayValue.WeChatPay) {
// 微信支付
- wechatPay(res.pay.config).then((res) => {
- uni.hideLoading()
- if (res === 'success') {
- toast.success('支付成功')
- result.value = 'success'
- } else if (res === 'cancel') {
- toast.info('已取消支付')
- result.value = 'fail'
- } else {
- toast.info('支付失败，请重试')
- result.value = 'fail'
- }
-
+ console.log("🚀 ~ res.pay:", res.pay)
+ if (res.pay_type && res.pay_type == 1) {
+ toast.success('支付成功')
+ result.value = 'success'
isSubmitting.value = false
router.navigateBack(1, 500)
return
- }).catch(() => {
- uni.hideLoading()
- toast.info('支付失败，请重试')
- return
- })
- }
+ } else {
+ wechatPay(res.pay.config).then((res) => {
+ console.log("🚀 ~ res:", res)
+ uni.hideLoading()
+ if (res === 'success') {
+ toast.success('支付成功')
+ result.value = 'success'
+ } else if (res === 'cancel') {
+ toast.info('已取消支付')
+ result.value = 'fail'
+ } else {
+ toast.info('支付失败，请重试')
+ result.value = 'fail'
+ }
+ isSubmitting.value = false
+ router.navigateBack(1, 500)
+ return
+ }).catch((e) => {
+ console.log("🚀 ~ error:", e)
+ uni.hideLoading()
+ toast.info('支付失败，请重试')
+ return
+ })
+ }
+ }
} catch (error) {
isSubmitting.value = false
uni.hideLoading()
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index f954ae6..3b32f63 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -95,7 +95,7 @@
- 距您{{ item.distance }}km
+ 距您{{ item.distance }}
diff --git a/src/pages/notice/reserve.vue b/src/pages/notice/reserve.vue
index 89b87be..4e2665c 100644
--- a/src/pages/notice/reserve.vue
+++ b/src/pages/notice/reserve.vue
@@ -44,11 +44,13 @@
const storeId = ref(0) // 店铺ID
const storeType = ref(0) // 1. 直营 2. 加盟
+ const orderId = ref(0) // 订单ID
onLoad((args) => {
storeId.value = Number(args.storeId) || 0
storeType.value = Number(args.storeType) || 0
- console.log("🚀 ~ 456 storeId:", storeId.value, storeType.value)
+ orderId.value = Number(args.orderId) || 0
+ console.log("🚀 ~ orderId.value:", orderId.value)
type.value = args.type || ''
isGroupBuying.value = Number(args.isGroupBuying) || 0
@@ -60,7 +62,7 @@
*/
handleRoomSeeOrder: () => {
if (isGroupBuying.value) {
- router.reLaunch( `/bundle/tea-room/room?id=${storeId.value}&type=${storeType.value}`)
+ router.navigateTo('/bundle/order/platform/order-list')
} else {
router.navigateTo('/bundle/order/tea-room/order-list')
}