diff --git a/README.md b/README.md
index 01610ff..652f0c5 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
开发规范
-1. 页面或组件添加方法的时候前面加上handle关键字
+1. 页面或组件添加方法的时候前面加上handle关键字,除了插件相关内容如mescroll
handleConfirmHour: () => {
if (totalHour.value <= 0) {
toast.info('至少起订N小时')
diff --git a/src/bundle/reserve-room/detail.vue b/src/bundle/reserve-room/detail.vue
index e666673..4b5b7ee 100644
--- a/src/bundle/reserve-room/detail.vue
+++ b/src/bundle/reserve-room/detail.vue
@@ -310,7 +310,7 @@
])
const current = ref(0)
const html: string = '这里是富文本内容,需要后台传递
'
- const isGroupBuying: boolean = false // 是否是团购套餐
+ const isGroupBuying: boolean = true // 是否是团购套餐
const pay = ref(1) // 支付方式
const payList = ref>([
{
@@ -343,6 +343,7 @@
const endTimeValue = ref('') // 结束时间
const now = new Date()
const minTimestamp = Date.now()
+
// 允许选择未来两个月的日期
const maxTimestamp = new Date(now.getFullYear(), now.getMonth() + 1, now.getDate()).getTime()
const startTimeLayout = ref('')
@@ -354,7 +355,12 @@
const showPayPopup = ref(false) // 支付popup
onLoad(() => {
-
+ if (isGroupBuying) {
+ // TODO 如果是团购套餐则直接微信支付?
+ pay.value = 3
+ console.log("🚀 ~ pay.value:", pay.value)
+ }
+
})
const detail = {
diff --git a/src/bundle/reserve-room/room.vue b/src/bundle/reserve-room/room.vue
index 260ff6d..9e1d777 100644
--- a/src/bundle/reserve-room/room.vue
+++ b/src/bundle/reserve-room/room.vue
@@ -27,7 +27,7 @@
+ @click="room.handleClick" mode="aspectFit">
@@ -78,17 +78,17 @@
-
+
-
+
-
+
@@ -132,6 +132,8 @@
const sheetMenu = ref([])
const showServicePopup = ref(false)
+ const storeType = ref(1) // 1:直营 2:加盟
+
/* mescroll */
const { mescrollInit, downCallback } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
@@ -267,21 +269,10 @@
console.log('Clicked item:', item)
},
- onChange: (e: any) => {
- // 设置 current.value 为当前轮播索引
- current.value = e.current
- },
-
handleToRecharge: () => {
uni.navigateTo({
url: '/bundle/store-recharge/store-recharge'
})
- },
-
- back: () => {
- uni.navigateBack({
- delta: 1,
- })
}
}
diff --git a/src/components/reserve/room-list.vue b/src/components/reserve/room-list.vue
index 44404ae..22b952b 100644
--- a/src/components/reserve/room-list.vue
+++ b/src/components/reserve/room-list.vue
@@ -35,8 +35,8 @@
- 适用包间:绿茶、红茶、青茶、白茶、绿茶适用包间:绿茶、红茶、青茶、白茶、绿茶
-
+ 适用包间:绿茶、红茶、青茶、白茶、绿茶适用包间:绿茶、红茶、青茶、白茶、绿茶
+
@@ -68,6 +68,7 @@
+
+
+
+
+
+
+
+
diff --git a/src/pages/result/pay.vue b/src/pages/result/pay.vue
new file mode 100644
index 0000000..59b1365
--- /dev/null
+++ b/src/pages/result/pay.vue
@@ -0,0 +1,20 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/result/reserve.vue b/src/pages/result/reserve.vue
new file mode 100644
index 0000000..bfe457e
--- /dev/null
+++ b/src/pages/result/reserve.vue
@@ -0,0 +1,20 @@
+{
+ "layout": "default",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+}
+
+
+
+
+
+
+
+
+
+
+