From 4c33f1b4602882869f9e73b1d3307e0e392f3cb5 Mon Sep 17 00:00:00 2001
From: wangxiaowei <1121133807@qq.com>
Date: Wed, 13 May 2026 09:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/bundle/collect/collect.vue | 23 ++++++++++++++++++-
.../order/tea-specialist/order-detail.vue | 16 ++++++-------
src/bundle/package/reserve.vue | 2 +-
src/bundle/profile/profile.vue | 2 +-
src/bundle_b/pages/tea-specialist/reserve.vue | 15 +++++++++---
5 files changed, 44 insertions(+), 14 deletions(-)
diff --git a/src/bundle/collect/collect.vue b/src/bundle/collect/collect.vue
index baeb93b..cf887cf 100644
--- a/src/bundle/collect/collect.vue
+++ b/src/bundle/collect/collect.vue
@@ -88,6 +88,9 @@
{{ item.name }}
+
+ {{ GetTeaSpecialistLevelLabel(item.level) }}
+
@@ -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(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;
+}
diff --git a/src/bundle/order/tea-specialist/order-detail.vue b/src/bundle/order/tea-specialist/order-detail.vue
index 1f08478..66508b5 100644
--- a/src/bundle/order/tea-specialist/order-detail.vue
+++ b/src/bundle/order/tea-specialist/order-detail.vue
@@ -232,15 +232,15 @@
-
- 待付款
- 待接单
+
+ 待付款
+ 待接单
已退款
- 已预约
- 已出发
- 服务中
- 完成
- 订单取消
+ 已预约
+ 已出发
+ 服务中
+ 完成
+ 订单取消
diff --git a/src/bundle/package/reserve.vue b/src/bundle/package/reserve.vue
index 3147bfa..d74c262 100644
--- a/src/bundle/package/reserve.vue
+++ b/src/bundle/package/reserve.vue
@@ -256,7 +256,7 @@
-
+
diff --git a/src/bundle/profile/profile.vue b/src/bundle/profile/profile.vue
index e00b0eb..77220cd 100644
--- a/src/bundle/profile/profile.vue
+++ b/src/bundle/profile/profile.vue
@@ -119,7 +119,7 @@
- 2.14.17
+ 2.14.18
diff --git a/src/bundle_b/pages/tea-specialist/reserve.vue b/src/bundle_b/pages/tea-specialist/reserve.vue
index 4833251..5a3287e 100644
--- a/src/bundle_b/pages/tea-specialist/reserve.vue
+++ b/src/bundle_b/pages/tea-specialist/reserve.vue
@@ -142,9 +142,9 @@
-
+
-
+
茶艺服务
@@ -247,7 +247,7 @@
-
+
@@ -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
// 计算费用明细