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

修改功能

Browse Source
This commit is contained in:
wangxiaowei
2026-05-13 09:53:09 +08:00
parent 473e40b817
commit 4c33f1b460
5 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/bundle/collect/collect.vue
View File

@ -88,6 +88,9 @@
<view class="font-bold text-[#303133] text-30rpx leading-42rpx mr-12rpx">
{{ item.name }}
</view>
<view class="tea-specialist-level-badge flex items-center shrink-0 mr-12rpx">
<text class="tea-specialist-level-badge__text ml-6rpx">{{ GetTeaSpecialistLevelLabel(item.level) }}</text>
</view>
<view class="flex items-center">
<wd-icon name="star-on" size="22rpx" color="#FF5951"></wd-icon>
<view class="font-400 text-24rpx text-[#FF5951] leading-34rpx ml-6rpx">
@ -181,9 +184,10 @@ import { ref } from 'vue'
import { toast } from '@/utils/toast'
import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
import { getCollectTeaRoomList, collectTeaRoom } from '@/api/tea-room'
import { collectTeaRoom } from '@/api/tea-room'
import { getCollectTeaSpecialistList, collectTeaSpecialist } from '@/api/tea-specialist'
import { router, previewImage } from '@/utils/tools'
import { GetTeaSpecialistLevelLabel } from '@/utils/teaSpecialist'
const tab = ref<number>(0)
const OSS = inject('OSS')
@ -327,4 +331,21 @@ page {
background-image: url(#{$OSS}images/collect/collect_image1.png);
background-size: 100% 100%;
}
.tea-specialist-level-badge {
height: 40rpx;
padding: 0 14rpx 0 8rpx;
border-radius: 999rpx;
background: linear-gradient(135deg, #f7fbf4 0%, #e5f5de 100%);
border: 1rpx solid rgba(76, 159, 68, 0.18);
box-shadow: 0 6rpx 16rpx rgba(76, 159, 68, 0.08);
}
.tea-specialist-level-badge__text {
color: #2f7d32;
font-size: 22rpx;
line-height: 22rpx;
font-weight: 600;
letter-spacing: 2rpx;
}
</style>

16
src/bundle/order/tea-specialist/order-detail.vue
View File

@ -232,15 +232,15 @@
<wd-img width="190rpx" height="190rpx" :src="order.image" mode="scaleToFill" @click="OrderDetail.handlePreviewImage(order.image, order.image_arr)"></wd-img>
</view>
<view class="flex-1">
<view class="flex flex-col items-end shrink-0">
<text v-if="orderStatus === TeaSpecialistOrderStatus.Unpaid" class="text-28rpx mb-12rpx text-[#FF5951]">待付款</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Pending" class="text-28rpx mb-12rpx text-[#FF5951]">待接单</text>
<view class="flex flex-col items-end shrink-0 text-[#FF5951]">
<text v-if="orderStatus === TeaSpecialistOrderStatus.Unpaid" class="text-28rpx mb-12rpx">待付款</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Pending" class="text-28rpx mb-12rpx">待接单</text>
<text v-else-if="orderStatus >= TeaSpecialistOrderStatus.SpecialistRefund && orderStatus <= TeaSpecialistOrderStatus.CustomerRefundAfterArrive" class="text-28rpx mb-12rpx text-[#606266]">已退款</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Accepted" class="text-28rpx mb-12rpx text-[#4C9F44]">已预约</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Departed" class="text-28rpx mb-12rpx text-[#4C9F44]">已出发</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Arrived" class="text-28rpx mb-12rpx text-[#4C9F44]">服务中</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Completed" class="text-28rpx mb-12rpx text-[#606266]">完成</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Cancelled" class="text-28rpx mb-12rpx text-[#C9C9C9]">订单取消</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Accepted" class="text-28rpx mb-12rpx">已预约</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Departed" class="text-28rpx mb-12rpx">已出发</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Arrived" class="text-28rpx mb-12rpx">服务中</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Completed" class="text-28rpx mb-12rpx">完成</text>
<text v-else-if="orderStatus === TeaSpecialistOrderStatus.Cancelled" class="text-28rpx mb-12rpx">订单取消</text>
</view>
<view class="flex justify-between items-center">
<view class="font-bold text-30rpx leading-42rpx text-[#303133] mr-10rpx line-1 w-280rpx">

2
src/bundle/package/reserve.vue
View File

@ -256,7 +256,7 @@
<!-- 茶艺师信息 -->
<view class="flex items-center bg-white p-20rpx rounded-10rpx mb-20rpx mt-20rpx">
<view class="mr-28rpx relative">
<wd-img width="200rpx" height="200rpx" :src="info.image" radius="10rpx" @click="previewImage(info.image, [info.image])"></wd-img>
<wd-img width="200rpx" height="200rpx" :src="info.image" radius="10rpx" @click="previewImage(info.image, info.image_arr)"></wd-img>
</view>
<view class="">
<view class="font-bold text-[#303133] text-30rpx leading-42rpx mr-14rpx">

2
src/bundle/profile/profile.vue
View File

@ -119,7 +119,7 @@
<view class="flex justify-end">
<view class="flex items-center">
<view class="font-400 text-[#303133] text-30rpx leading-42rpx">
2.14.17
2.14.18
</view>
</view>
</view>

15
src/bundle_b/pages/tea-specialist/reserve.vue
View File

@ -142,9 +142,9 @@
</wd-popup>
<!-- 茶艺服务 -->
<wd-popup v-model="showTeaServicePopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom">
<wd-popup v-model="showTeaServicePopup" lock-scroll custom-style="border-radius: 32rpx 32rpx 0rpx 0rpx;" position="bottom" @close="uni.hideKeyboard()">
<view class="relative">
<view class="absolute top-18rpx right-30rpx" @click="showTeaServicePopup = false">
<view class="absolute top-18rpx right-30rpx" @click="Reserve.handleCloseTeaServicePopup">
<wd-img width="60rpx" height='60rpx' :src="`${OSS}icon/icon_close.png`"></wd-img>
</view>
<view class="text-36rpx text-[#121212] leading-50rpx text-center pt-50rpx pb-40rpx">茶艺服务</view>
@ -247,7 +247,7 @@
<!-- 茶艺师信息 -->
<view class="flex items-center bg-white p-20rpx rounded-10rpx mb-20rpx mt-20rpx">
<view class="mr-28rpx relative">
<wd-img width="200rpx" height="200rpx" radius="10rpx" :src="info.image" @click="previewImage(info.image, [info.image])"></wd-img>
<wd-img width="200rpx" height="200rpx" radius="10rpx" :src="info.image" @click="previewImage(info.image, info.image_arr)"></wd-img>
</view>
<view class="">
<view class="font-bold text-[#303133] text-30rpx leading-42rpx mr-14rpx">
@ -858,6 +858,14 @@
teaUsageValue.value = 0
},
/**
* 关闭茶艺服务弹窗
*/
handleCloseTeaServicePopup: () => {
uni.hideKeyboard()
showTeaServicePopup.value = false
},
/**
* 确认茶艺服务
*/
@ -866,6 +874,7 @@
toast.info('请选择预定茶叶')
return
}
uni.hideKeyboard()
showTeaServicePopup.value = false
// 计算费用明细