完善页面
This commit is contained in:
@ -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)
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
<view class="content mx-30rpx mt-34rpx">
|
||||
<mescroll-body ref="mescrollItem" @init="mescrollInit" @down="downCallback" @up="OrderList.upCallback" :down="downOption" :up="upOption">
|
||||
<view class="mb-20rpx" v-for="(item, index) in list" :key="index">
|
||||
<combo-card :type="OrderSource.Combo" :order="item"></combo-card>
|
||||
<combo-card :type="OrderSource.Combo" :order="item" @refresh="OrderList.handleResetSearch"></combo-card>
|
||||
</view>
|
||||
</mescroll-body>
|
||||
</view>
|
||||
@ -79,6 +79,16 @@
|
||||
// tab
|
||||
const tab = ref<string>('all')
|
||||
|
||||
const canReset = ref<boolean>(false) // 避免onShow重复加载
|
||||
|
||||
onShow(() => {
|
||||
if (canReset.value) {
|
||||
list.value = []
|
||||
getMescroll().resetUpScroll();
|
||||
}
|
||||
canReset.value = true
|
||||
})
|
||||
|
||||
onLoad(() => {
|
||||
uni.$on('refreshComboOrderList', () => {
|
||||
list.value = []
|
||||
|
||||
@ -12,7 +12,7 @@
|
||||
<wd-navbar safeAreaInsetTop custom-class='!bg-[#F6F7F8]' :bordered="false" placeholder>
|
||||
<template #left>
|
||||
<view class="h-48rpx flex items-center">
|
||||
<view class="mt-4rpx" @click="router.navigateBack()">
|
||||
<view class="mt-4rpx" @click="OrderList.handleBack()">
|
||||
<wd-icon name="thin-arrow-left" size="30rpx"></wd-icon>
|
||||
</view>
|
||||
<view class="search-box">
|
||||
@ -129,6 +129,15 @@
|
||||
handleSearch: () => {
|
||||
list.value = []
|
||||
getMescroll().resetUpScroll();
|
||||
},
|
||||
|
||||
/**
|
||||
* 因为会从页面分享页跳转,但是返回时页面没有栈,所以需要switch方法跳转
|
||||
*/
|
||||
handleBack: () => {
|
||||
router.navigateBack().catch(err => {
|
||||
router.switchTab('/pages/my/my')
|
||||
})
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<!-- 使用 type="home" 属性设置首页,其他页面不需要设置,默认为page -->
|
||||
<route lang="jsonc" type="page">{
|
||||
"needLogin": true,
|
||||
"layout": "tabbar",
|
||||
"style": {
|
||||
"navigationStyle": "custom"
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
<!-- 使用 type="home" 属性设置首页,其他页面不需要设置,默认为page -->
|
||||
<route lang="jsonc" type="page">{
|
||||
"needLogin": true,
|
||||
"layout": "tabbar",
|
||||
"style": {
|
||||
"navigationStyle": "custom"
|
||||
|
||||
@ -160,7 +160,7 @@
|
||||
</template>
|
||||
</view>
|
||||
<view class="mt-4rpx">
|
||||
<wd-icon name="chevron-right" size="22px" color="#909399"></wd-icon>
|
||||
<wd-icon name="chevron-right" size="32rpx" color="#909399"></wd-icon>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -181,7 +181,7 @@
|
||||
</template>
|
||||
</view>
|
||||
<view class="mt-4rpx">
|
||||
<wd-icon name="chevron-right" size="22px" color="#909399"></wd-icon>
|
||||
<wd-icon name="chevron-right" size="32rpx" color="#909399"></wd-icon>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -59,11 +59,11 @@
|
||||
</view>
|
||||
<view>
|
||||
<view class="text-30rpx leading-42rpx text-[#303133]">茶室预定</view>
|
||||
<view class="text-28rpx leading-30rpx text-[#606266] mt-14rpx">预定茶室享受八折优惠</view>
|
||||
<view class="text-28rpx leading-30rpx text-[#606266] mt-14rpx">预定茶室享受九折优惠</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="flex items-center mt-74rpx">
|
||||
<!-- <view class="flex items-center mt-74rpx">
|
||||
<view class="mr-26rpx">
|
||||
<wd-img width="88rpx" height="88rpx" :src="`${OSS}images/vip_benefits/vip_benefits_image4.png`"></wd-img>
|
||||
</view>
|
||||
@ -97,12 +97,12 @@
|
||||
<view class="text-28rpx leading-40rpx text-[#606266] mt-14rpx">✓.尊享20个VIP名额(价值7980元)</view>
|
||||
<view class="text-28rpx leading-42rpx text-[#606266] mt-14rpx">✓.下级VIP消费金额5%永久提成,构建持续收益管道</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="btn text-center leading-108rpx mx-auto mt-116rpx" @click="benefits.handledToBuyVip" v-if="currentVipType === 'normal'">
|
||||
立即成为会员 ¥499/年
|
||||
立即成为会员 ¥9.9/年
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
<view class="mt-24rpx mx-30rpx">
|
||||
<view class="text-center">
|
||||
<view class="text-48rpx leading-66rpx text-[#303133]">¥499.00</view>
|
||||
<view class="text-48rpx leading-66rpx text-[#303133]">9.9</view>
|
||||
<view class="mt-20rpx text-28rpx leading-40rpx text-[#9CA3AF]">开通会员,解锁更多精彩内容!</view>
|
||||
</view>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user