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-09-14 18:01:30 +08:00
parent 3045f4e5c4
commit 6d2cba0f34
15 changed files with 488 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/components/order/ComboCard.vue
View File

@ -13,9 +13,9 @@
</view>
</view>
<view class="font-400 text-28rpx leading-40rpx">
<text class="text-[#4C9F44]" v-if="orderType === GroupBuyingCategoryOrderStatus.ToUse">待使用</text>
<text class="text-[#606266]" v-if="orderType === GroupBuyingCategoryOrderStatus.Used">已使用</text>
<text class="text-[#C9C9C9]" v-if="orderType === GroupBuyingCategoryOrderStatus.Refunded">已退款</text>
<text class="text-[#4C9F44]" v-if="orderStatus === GroupBuyingCategoryOrderStatus.ToUse">待使用</text>
<text class="text-[#606266]" v-if="orderStatus === GroupBuyingCategoryOrderStatus.Used">已使用</text>
<text class="text-[#C9C9C9]" v-if="orderStatus === GroupBuyingCategoryOrderStatus.Refunded">已退款</text>
</view>
</view>
<view class="mt-22rpx">
@ -57,9 +57,9 @@
</view>
</view>
<view class="font-400 text-28rpx leading-40rpx mt-12rpx">
<text class="text-[#4C9F44]" v-if="orderType === GroupBuyingCategoryOrderStatus.ToUse">待使用</text>
<text class="text-[#606266]" v-if="orderType === GroupBuyingCategoryOrderStatus.Used">已使用</text>
<text class="text-[#C9C9C9]" v-if="orderType === GroupBuyingCategoryOrderStatus.Refunded">已退款</text>
<text class="text-[#4C9F44]" v-if="orderStatus === GroupBuyingCategoryOrderStatus.ToUse">待使用</text>
<text class="text-[#606266]" v-if="orderStatus === GroupBuyingCategoryOrderStatus.Used">已使用</text>
<text class="text-[#C9C9C9]" v-if="orderStatus === GroupBuyingCategoryOrderStatus.Refunded">已退款</text>
</view>
</view>
<view class="mt-22rpx">
@ -97,9 +97,9 @@
</view>
</view>
<view class="font-400 text-28rpx leading-40rpx mt-12rpx text-[#4C9F44]">
<text v-if="orderType === ReserveCategoryOrderStatus.Consuming">消费中</text>
<text v-if="orderType === ReserveCategoryOrderStatus.Reserved">已预约</text>
<text v-if="orderType === ReserveCategoryOrderStatus.Serving">服务中</text>
<text v-if="orderStatus === ReserveCategoryOrderStatus.Consuming">消费中</text>
<text v-if="orderStatus === ReserveCategoryOrderStatus.Reserved">已预约</text>
<text v-if="orderStatus === ReserveCategoryOrderStatus.Serving">服务中</text>
</view>
</view>
<view class="mt-22rpx">
@ -136,9 +136,9 @@
<view class="bg-[#F0F6EF] text-[#006C2D] font-400 text-22rpx leading-32rpx rounded-4rpx text-center w-150rpx ml-18rpx pb-4rpx">金牌茶艺师</view>
</view>
<view class="font-400 text-28rpx leading-20rpx text-[#4C9F44] flex items-center">
<text v-if="orderType === ReserveCategoryOrderStatus.Consuming">消费中</text>
<text v-if="orderType === ReserveCategoryOrderStatus.Reserved">已预约</text>
<text v-if="orderType === ReserveCategoryOrderStatus.Serving">服务中</text>
<text v-if="orderStatus === ReserveCategoryOrderStatus.Consuming">消费中</text>
<text v-if="orderStatus === ReserveCategoryOrderStatus.Reserved">已预约</text>
<text v-if="orderStatus === ReserveCategoryOrderStatus.Serving">服务中</text>
</view>
</view>
@ -161,8 +161,7 @@
</template>
<script lang="ts" setup name="ComboCard">
import { GroupBuyingCategory, GroupBuyingCategoryOrderStatus } from '@/utils/groupBuying'
import { ReserveCategory, ReserveCategoryOrderStatus } from '@/utils/platformService'
import { GroupBuyingCategory, GroupBuyingCategoryOrderStatus, ReserveCategory, ReserveCategoryOrderStatus } from '@/utils/order'
/**
* ComboCard 套餐卡片组件
@ -181,9 +180,9 @@
},
/**
* 订单类型: 待使用、退款等
* TODO 这里的orderType在接入接口的时候需要改为类似于data.orderType这种形式
* TODO 这里的orderStatus在接入接口的时候需要改为类似于data.orderStatus这种形式
*/
orderType: {
orderStatus: {
type: String,
default: GroupBuyingCategoryOrderStatus.ToUse
}
@ -203,17 +202,17 @@
switch (props.type) {
case 'Direct':
uni.navigateTo({
url: `/bundle/order/platform/direct-order-detail?orderType=${props.orderType}`
url: `/bundle/order/platform/direct-order-detail?orderStatus=${props.orderStatus}`
})
break;
case 'Franchise':
uni.navigateTo({
url: `/bundle/order/platform/franchise-order-detail?orderType=${props.orderType}`
url: `/bundle/order/platform/franchise-order-detail?orderStatus=${props.orderStatus}`
})
break;
case 'DouYin':
uni.navigateTo({
url: `/bundle/order/douyin/douyin-order-detail?orderType=${props.orderType}`
url: `/bundle/order/douyin/douyin-order-detail?orderStatus=${props.orderStatus}`
})
break;
default:

14
src/components/order/ComboCoupon.vue
View File

@ -28,7 +28,7 @@
</view>
<!-- 平台团购直营店待使用 -->
<view class="mt-30rpx font-500 leading-48rpx" v-if="type === 'Direct' && orderType === GroupBuyingCategoryOrderStatus.ToUse">
<view class="mt-30rpx font-500 leading-48rpx" v-if="type === 'Direct' && orderStatus === GroupBuyingCategoryOrderStatus.ToUse">
<view class="text-26rpx text-[#606266]">有效期：2025.04.04-2025.12.31</view>
<view class="text-28rpx text-[#303133] mt-18rpx">
<text class="mr-20rpx">券码 1052 4258 5654 125</text>
@ -38,7 +38,7 @@
</view>
<!-- 平台团购直营店已使用 -->
<view class="coupon-bg" v-if="type === 'Direct' && orderType === GroupBuyingCategoryOrderStatus.Used">
<view class="coupon-bg" v-if="type === 'Direct' && orderStatus === GroupBuyingCategoryOrderStatus.Used">
<view class="flex items-center px-30rpx pt-30rpx pb-40rpx" @click="comboCoupon.handleToStore">
<view class="mr-30rpx">
<wd-img width="190rpx" height="190rpx" :src="`${OSS}images/home/home_image5.png`" mode="scaleToFill"></wd-img>
@ -71,7 +71,7 @@
</view>
<!-- 平台团购加盟-待使用 -->
<view class="coupon-bg2 p-30rpx" v-if="type === 'Franchise' && orderType === GroupBuyingCategoryOrderStatus.ToUse">
<view class="coupon-bg2 p-30rpx" v-if="type === 'Franchise' && orderStatus === GroupBuyingCategoryOrderStatus.ToUse">
<view class="flex items-center">
<view class="mr-30rpx">
<wd-img width="190rpx" height="190rpx" :src="`${OSS}images/home/home_image5.png`" mode="scaleToFill"></wd-img>
@ -107,7 +107,7 @@
</view>
<!-- 抖音团购已使用 -->
<view class="bg-white rounded-16rpx p-30rpx" v-if="orderType === GroupBuyingCategoryOrderStatus.Used && type === 'DouYin'">
<view class="bg-white rounded-16rpx p-30rpx" v-if="orderStatus === GroupBuyingCategoryOrderStatus.Used && type === 'DouYin'">
<view class="flex items-center" @click="comboCoupon.handleToStore">
<view class="mr-30rpx">
<wd-img width="190rpx" height="190rpx" :src="`${OSS}images/home/home_image5.png`" mode="scaleToFill"></wd-img>
@ -131,7 +131,7 @@
</template>
<script lang="ts" setup name="ComboCoupon">
import { GroupBuyingCategoryOrderStatus } from '@/utils/groupBuying'
import { GroupBuyingCategoryOrderStatus } from '@/utils/order'
/**
* Combo 套餐券组件
@ -150,9 +150,9 @@
},
/**
* 订单类型: 待使用、退款等
* TODO 这里的orderType在接入接口的时候需要改为类似于data.orderType这种形式
* TODO 这里的orderStatus在接入接口的时候需要改为类似于data.orderStatus这种形式
*/
orderType: {
orderStatus: {
type: String,
default: ''
}

2
src/components/reserve/RoomList.vue
View File

@ -72,7 +72,7 @@
*/
import PriceFormat from '@/components/PriceFormat.vue'
import {ReserveServiceCategory} from '@/utils/platformService'
import {ReserveServiceCategory} from '@/utils/order'
const OSS = inject('OSS')