diff --git a/src/api/pay.ts b/src/api/pay.ts
index ced767b..0a6ca97 100644
--- a/src/api/pay.ts
+++ b/src/api/pay.ts
@@ -9,7 +9,7 @@ export interface IPrePayParams {
pay_way: number
order_source: number
order_type: number
- store_id: number
+ store_id?: number
}
export function prePay(data: IPrePayParams) {
diff --git a/src/api/tea-room.ts b/src/api/tea-room.ts
index 50f5fb1..ba86742 100644
--- a/src/api/tea-room.ts
+++ b/src/api/tea-room.ts
@@ -50,6 +50,7 @@ export interface IHomeTeaStoreListParams {
search: string
latitude: number
longitude: number
+ city_area_id: number
}
export function getHomeTeaStoreList(data: IHomeTeaStoreListParams) {
diff --git a/src/api/types/tea.ts b/src/api/types/tea.ts
index 1364f4c..62b3b56 100644
--- a/src/api/types/tea.ts
+++ b/src/api/types/tea.ts
@@ -133,7 +133,10 @@ export interface ITeaSpecialistOrderDetailsResult {
start_time: string
end_time: string
renew_price: number
- }
+ },
+ is_lockpwd?: number,
+ gate_key?: string,
+ room_key?: string
}
/**
diff --git a/src/bundle/order/douyin/excharge.vue b/src/bundle/order/douyin/excharge.vue
index 0584420..72b62b0 100644
--- a/src/bundle/order/douyin/excharge.vue
+++ b/src/bundle/order/douyin/excharge.vue
@@ -91,14 +91,14 @@
uni.scanCode({
success: async (res) => {
console.log("🚀 ~ res:", res)
- if(res.rawData) {
- code.value = res.rawData
+ if(res.result) {
+ code.value = res.result
uni.showLoading({ title: '兑换中...' })
try {
const params = {
store_id: storeId.value,
- code: res.rawData.replace(/\s+/g, ''),
- type: 1
+ code: res.result.trim(),
+ type: 2
}
await checkDouyinCoupon(params)
diff --git a/src/bundle/order/platform/order-list.vue b/src/bundle/order/platform/order-list.vue
index ad18933..8acad20 100644
--- a/src/bundle/order/platform/order-list.vue
+++ b/src/bundle/order/platform/order-list.vue
@@ -34,7 +34,7 @@
-
+
@@ -79,6 +79,16 @@
// tab
const tab = ref('all')
+ const canReset = ref(false) // 避免onShow重复加载
+
+ onShow(() => {
+ if (canReset.value) {
+ list.value = []
+ getMescroll().resetUpScroll();
+ }
+ canReset.value = true
+ })
+
onLoad(() => {
uni.$on('refreshComboOrderList', () => {
list.value = []
diff --git a/src/bundle/order/tea-room/order-list.vue b/src/bundle/order/tea-room/order-list.vue
index b99323d..3f4b968 100644
--- a/src/bundle/order/tea-room/order-list.vue
+++ b/src/bundle/order/tea-room/order-list.vue
@@ -12,7 +12,7 @@
-
+
@@ -129,6 +129,15 @@
handleSearch: () => {
list.value = []
getMescroll().resetUpScroll();
+ },
+
+ /**
+ * 因为会从页面分享页跳转，但是返回时页面没有栈，所以需要switch方法跳转
+ */
+ handleBack: () => {
+ router.navigateBack().catch(err => {
+ router.switchTab('/pages/my/my')
+ })
}
}
diff --git a/src/bundle/tea-room/choose-room-reserve.vue b/src/bundle/tea-room/choose-room-reserve.vue
index 1529774..2569852 100644
--- a/src/bundle/tea-room/choose-room-reserve.vue
+++ b/src/bundle/tea-room/choose-room-reserve.vue
@@ -1,5 +1,6 @@
{
+ "needLogin": true,
"layout": "tabbar",
"style": {
"navigationStyle": "custom"
diff --git a/src/bundle/tea-room/choose-room.vue b/src/bundle/tea-room/choose-room.vue
index aa26f91..0201f87 100644
--- a/src/bundle/tea-room/choose-room.vue
+++ b/src/bundle/tea-room/choose-room.vue
@@ -1,5 +1,6 @@
{
+ "needLogin": true,
"layout": "tabbar",
"style": {
"navigationStyle": "custom"
diff --git a/src/bundle/tea-room/detail.vue b/src/bundle/tea-room/detail.vue
index 031f68d..31a5020 100644
--- a/src/bundle/tea-room/detail.vue
+++ b/src/bundle/tea-room/detail.vue
@@ -160,7 +160,7 @@
-
+
@@ -181,7 +181,7 @@
-
+
diff --git a/src/bundle/vip/benefits.vue b/src/bundle/vip/benefits.vue
index 99ce14e..3d17b17 100644
--- a/src/bundle/vip/benefits.vue
+++ b/src/bundle/vip/benefits.vue
@@ -59,11 +59,11 @@
茶室预定
- 预定茶室享受八折优惠
+ 预定茶室享受九折优惠
-
+
- 立即成为会员 ￥499/年
+ 立即成为会员 ￥9.9/年
diff --git a/src/bundle/vip/buy.vue b/src/bundle/vip/buy.vue
index b699e16..bef4336 100644
--- a/src/bundle/vip/buy.vue
+++ b/src/bundle/vip/buy.vue
@@ -16,7 +16,7 @@
- ￥499.00
+ 9.9
开通会员，解锁更多精彩内容！
diff --git a/src/components/navbar.vue b/src/components/navbar.vue
index 0862191..5d7fc5c 100644
--- a/src/components/navbar.vue
+++ b/src/components/navbar.vue
@@ -2,8 +2,8 @@
-
-
+
+
{{ title }}
@@ -73,6 +73,11 @@
iconLeftColor: {
type: String,
default: '#121212'
+ },
+
+ hideLeftIcon: {
+ type: Boolean,
+ default: false
}
})
diff --git a/src/components/order/ComboCard.vue b/src/components/order/ComboCard.vue
index dd5360d..5d9bed0 100644
--- a/src/components/order/ComboCard.vue
+++ b/src/components/order/ComboCard.vue
@@ -261,6 +261,8 @@
// 取消订单弹窗
const message = useMessage('wd-message-box-slot')
+ const emit = defineEmits(['refresh'])
+
const ComboCard = {
/**
* 跳转到对对应室的详情页
@@ -291,8 +293,9 @@
case OrderSource.Combo:
orderType = PayOrderType.ComboRefund
let res = await handleRefundOrderHooks(order.id, orderType)
+ console.log("🚀 ~ res:", res)
if (res) {
- uni.$emit('refreshComboOrderList')
+ emit('refresh')
}
// TODO 这里调用删除直营订单的接口
break;
diff --git a/src/pages/city/city.vue b/src/pages/city/city.vue
index e8f24ac..1628706 100644
--- a/src/pages/city/city.vue
+++ b/src/pages/city/city.vue
@@ -96,14 +96,15 @@
*/
handleChooseCity: (item: any) => {
const params = {
- latitude: item.latitude,
- longitude: item.longitude,
+ // latitude: item.latitude,
+ // longitude: item.longitude,
+ id: item.id,
city: item.name
}
uni.$emit('locationUpdate', params)
- uni.setStorageSync(LOCATION_LAT_KEY, item.latitude)
- uni.setStorageSync(LOCATION_LNG_KEY, item.longitude)
+ // uni.setStorageSync(LOCATION_LAT_KEY, item.latitude)
+ // uni.setStorageSync(LOCATION_LNG_KEY, item.longitude)
uni.setStorageSync(LOCATION_CITY_KEY, item.name)
router.navigateBack()
}
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 812073d..f954ae6 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -136,6 +136,7 @@
const city = ref('')
const keywords = ref('')
const list = ref>([])
+ const city_id = ref(0)
let lastLocation = { lat: 0, lng: 0 }
onShow(async () => {
@@ -152,7 +153,6 @@
lastLocation.lat = location.lat
lastLocation.lng = location.lng
- console.log("🚀 ~ city.value:", 'xxxxx', city.value)
Index.handleResetSearch()
}
}
@@ -172,6 +172,7 @@
city.value = location.city
latitude.value = location.latitude
longitude.value = location.longitude
+ console.log("🚀 ~ latitude.value:", latitude.value, longitude.value)
Index.handleResetSearch()
})
@@ -192,10 +193,11 @@
latitude: latitude.value,
longitude: longitude.value,
search: keywords.value,
- user_id: userId
+ user_id: userId,
+ city_area_id: city_id.value || 0
}
- uni.showLoading({ title: '加载中...' })
+ uni.showLoading({ title: '加载中...' })
try {
getHomeTeaStoreList(filter).then( res => {
uni.hideLoading()
@@ -227,12 +229,11 @@
*/
handleToCity: () => {
uni.$on('locationUpdate', params => {
- console.log("🚀 ~ params:", params)
uni.$off('locationUpdate')
-
city.value = params.city
- latitude.value = params.latitude
- longitude.value = params.longitude
+ city_id.value = params.id
+ // latitude.value = params.latitude
+ // longitude.value = params.longitude
Index.handleResetSearch()
})
router.navigateTo(`/pages/city/city?lat=${latitude.value}&lng=${longitude.value}`)
diff --git a/src/pages/login/login.vue b/src/pages/login/login.vue
index b5e9d03..45b0c2a 100644
--- a/src/pages/login/login.vue
+++ b/src/pages/login/login.vue
@@ -31,7 +31,7 @@
立即登录
-
+
@@ -131,14 +131,13 @@
}
},
- // 手机登录
/**
* 测试-账号登录
*/
// handleMobileLogin: async () => {
// const userStore = useUserStore()
// console.log("🚀 ~ userStore:", userStore)
- // const res = await userStore.mobileLogin('18868040087', 1, 2)
+ // const res = await userStore.mobileLogin('15005837859', 1, 2)
// if (res) {
// uni.setStorageSync('latitude', '30.74744')
// uni.setStorageSync('longitude', '120.78483')
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 39ba4da..b0f027e 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -365,7 +365,7 @@
// 获取会员过期时间
getUserMember().then(res => {
- expireTime.value = res.data.expiration_time
+ expireTime.value = res?.data?.expiration_time
})
},
@@ -394,14 +394,14 @@
handleShowService: () => {
showServiceMobile.value = true
sheetMenu.value = [
- { name: '400-800-8888' },
+ { name: '13000000000' },
]
},
// 选择菜单-拨打客服电话
handleSelectMenu: (item: any) => {
uni.makePhoneCall({
- phoneNumber: item.item.name
+ phoneNumber: item.item.name
})
},
diff --git a/src/pages/notice/reserve.vue b/src/pages/notice/reserve.vue
index 7bc5ec6..89b87be 100644
--- a/src/pages/notice/reserve.vue
+++ b/src/pages/notice/reserve.vue
@@ -41,8 +41,15 @@
// 是否是团购套餐
const isGroupBuying = ref(0)
+
+ const storeId = ref(0) // 店铺ID
+ const storeType = ref(0) // 1. 直营 2. 加盟
onLoad((args) => {
+ storeId.value = Number(args.storeId) || 0
+ storeType.value = Number(args.storeType) || 0
+ console.log("🚀 ~ 456 storeId:", storeId.value, storeType.value)
+
type.value = args.type || ''
isGroupBuying.value = Number(args.isGroupBuying) || 0
})
@@ -53,7 +60,7 @@
*/
handleRoomSeeOrder: () => {
if (isGroupBuying.value) {
- router.navigateTo('/bundle/order/platform/order-list')
+ router.reLaunch( `/bundle/tea-room/room?id=${storeId.value}&type=${storeType.value}`)
} else {
router.navigateTo('/bundle/order/tea-room/order-list')
}