wangxiaowei/chazhi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善页面

Browse Source
This commit is contained in:
wangxiaowei
2025-08-28 18:20:17 +08:00
parent fdaa01f801
commit e1a4f57610
27 changed files with 953 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/bundle/coupon/coupon.vue
View File

@ -32,7 +32,7 @@
:checked="item.id === checkedId"
:onCheck="coupons.handleCheck"
:class="index !== couponList.length - 1 ? 'mb-20rpx' : ''"
/>
></coupon>
</wd-radio-group>
</view>
</view>
@ -51,7 +51,7 @@
:checked="item.id === checkedId"
:onCheck="coupons.handleCheck"
:class="index !== couponList.length - 1 ? 'mb-20rpx' : ''"
/>
></coupon>
</wd-radio-group>
</view>
</view>
@ -74,7 +74,7 @@
:checked="item.id === checkedId"
:onCheck="coupons.handleCheck"
:class="index !== couponList.length - 1 ? 'mb-20rpx' : ''"
/>
></group-coupon>
</wd-radio-group>
</view>
</view>
@ -93,7 +93,7 @@
:checked="item.id === checkedId"
:onCheck="coupons.handleCheck"
:class="index !== couponList.length - 1 ? 'mb-20rpx' : ''"
/>
></group-coupon>
</wd-radio-group>
</view>
</view>
@ -112,8 +112,8 @@
<script lang="ts" setup>
import {ref} from 'vue'
import coupon from '@/components/coupon/coupon.vue'
import groupCoupon from '@/components/coupon/group-coupon.vue'
import Coupon from '@/components/coupon/Coupon.vue'
import GroupCoupon from '@/components/coupon/GroupCoupon.vue'
const couponType = ref<number>(2) // couponType 1:优惠券 2:团购券
const OSS = inject('OSS')

8
src/bundle/reserve-room/detail.vue
View File

@ -298,8 +298,8 @@
</template>
<script lang="ts" setup>
import { ref } from 'vue'
import {toast} from '@/utils/toast'
import PriceFormat from '@/components/PriceFormat.vue'
const OSS = inject('OSS')
@ -310,7 +310,7 @@
])
const current = ref<number>(0)
const html: string = '<p>这里是富文本内容，需要后台传递</p>'
const isGroupBuying: boolean = true // 是否是团购套餐
const isGroupBuying: boolean = false // 是否是团购套餐
const pay = ref<number>(1) // 支付方式
const payList = ref<Array<any>>([
{
@ -431,7 +431,9 @@
uni.navigateTo({ url: `/bundle/coupon/coupon?type=${type}` })
},
handlePay: () => {
handlePay: () => {
// 这里需要判断下如果是预约的话，跳转结果通知是reserve的，团购是pay的
// uni.navigateTo({ url: '/bundle/reserve-room/result' })
},

49
src/bundle/reserve-room/result.vue
View File

@ -1,49 +0,0 @@
<route lang="jsonc" type="page">
{
"layout": "default",
"style": {
"navigationBarTitleText": "结果通知",
"navigationBarBackgroundColor": "#FFF"
}
}
</route>
<template>
<view class="mx-62rpx">
<view class="w-300rpx h-278rpx mt-84rpx mx-auto">
<wd-img width="300rpx" height='278rpx' :src="`${OSS}images/reserve_room_image4.png`"></wd-img>
</view>
<view class="mt-60rpx text-center">
<view class="text-[#303133] text-36rpx leading-50rpx">茶室预约成功</view>
<view class="text-[#9CA3AF] text-28rpx leading-40rpx font-400 mt-20rpx">可以点击下方查看预约单具体信息</view>
</view>
<view class="mt-76rpx mx-30rpx flex justify-between items-center text-[32rpx] text-center">
<view class='bg-[#fff] text-[#303133] rounded-24rpx h-90rpx leading-90rpx w-300rpx mr-28rpx' @click="result.handleSeeOrder">查看订单</view>
<view class='bg-[#4C9F44] text-[#fff] rounded-24rpx h-90rpx leading-90rpx w-300rpx' @click="result.handleDone">完成</view>
</view>
</view>
</template>
<script lang="ts" setup>
const OSS = inject('OSS')
const result = {
handleSeeOrder: () => {
uni.navigateTo({
url: '/bundle/reserve-room/order'
})
},
handleDone: () => {
uni.navigateBack({
delta: 1
})
},
}
</script>
<style lang="scss">
page {
background-color: $cz-page-background;
}
</style>

11
src/bundle/reserve-room/room.vue
View File

@ -43,7 +43,7 @@
</view>
<view class="flex flex-col items-end">
<view @click="room.handleToRecharge">
<rechargeBtn name="充值" />
<recharge-btn name="充值"></recharge-btn>
</view>
<view class="text-24rpx text-[#818CA9] mt-18rpx">1分钟前有人充值</view>
</view>
@ -81,14 +81,14 @@
<wd-tab title="茶室预定" v-if="storeType != 2">
<view class="content mx-30rpx mt-34rpx">
<mescroll-body @init="mescrollInit" @down="downCallback" @up="room.upCallback">
<roomList :is-reserve="true" :store-type="storeType"></roomList>
<room-list :is-reserve="true" :store-type="storeType"></room-list>
</mescroll-body>
</view>
</wd-tab>
<wd-tab title="团购套餐">
<view class="content mx-30rpx mt-34rpx">
<mescroll-body @init="mescrollInit" @down="downCallback" @up="room.upCallback">
<roomList :is-group-buying="true" :is-reserve="false" :store-type="storeType"></roomList>
<room-list :is-group-buying="true" :is-reserve="false" :store-type="storeType"></room-list>
</mescroll-body>
</view>
</wd-tab>
@ -109,11 +109,10 @@
</template>
<script lang="ts" setup>
import { ref } from 'vue'
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js";
import rechargeBtn from '@/components/recharge-btn.vue'
import roomList from '@/components/reserve/room-list.vue'
import RechargeBtn from '@/components/RechargeBtn.vue'
import RoomList from '@/components/reserve/RoomList.vue'
import {toast} from '@/utils/toast'
const rightPadding = inject('capsuleOffset')

3
src/bundle/store-recharge/store-recharge.vue
View File

@ -41,14 +41,13 @@
<view class="flex-1 bg-[#F8F9FA] text-[#9CA3AF] rounded-8rpx ml-28rpx h-80rpx leading-80rpx rounded-8rpx pl-28rpx">上海浦东新区茶室店铺</view>
</view>
<view @click="storeRecharge.handleRecharge" class="fixed left-0 right-0 bottom-0 z-50 mx-60rpx flex items-center justify-center bg-[#4C9F44] rounded-8rpx text-[#fff] text-30rpx font-bold" :style="{ height: '90rpx', bottom: 'calc(env(safe-area-inset-bottom) + 26rpx)', opacity: canRecharge ? 1 : 0.5 }">
<view @click="storeRecharge.handleRecharge" class="fixed left-0 right-0 bottom-0 z-50 mx-60rpx flex items-center justify-center bg-[#4C9F44] rounded-8rpx text-[#fff] text-30rpx font-bold" :style="{ height: '90rpx', bottom: 'calc(env(safe-area-inset-bottom) + 26rpx)', city: canRecharge ? 1 : 0.5 }">
确定转入
</view>
</view>
</template>
<script lang="ts" setup>
import { ref } from 'vue'
import { getNavBarHeight } from '@/utils/index'
let navbarHeight = ref<number>(0)