添加茶艺师收藏功能

src/api/tea-specialist.ts

@@ -34,6 +34,7 @@ export function getTeaSpecialist(data: ITeaSpecialistParams) {
  * @param latitude 纬度
  */
 export interface ITeaSpecialistDetailParams {
+    user_id?: number
     team_user_id: number
     longitude: number
     latitude: number
@@ -127,3 +128,26 @@ export function getExclusiveCirclesLabel() {
 export function reserveGroupTeaSpecialist(data) {
     return http.Post<any>('/api/user/reservation', data)
 }
+
+/**
+ * 隐藏上门服务
+ */
+export function getSetting() {
+    return http.Post<any>('/api/setting/set', null, {
+        meta: { ignoreAuth: true }
+    })
+}
+
+/**
+ * 收藏茶艺师
+ */
+export function collectTeaSpecialist(data) {
+    return http.Post<any>('/api/teamaster/teamasterCollect', data)
+}
+
+/**
+ * 获取茶艺师收藏列表
+ */
+export function getCollectTeaSpecialistList(data) {
+    return http.Post<any>('/api/teamaster/teamasterCollectList', data)
+}

src/bundle/collect/collect.vue

@@ -1,12 +1,10 @@
-<route lang="jsonc" type="page">
+<route lang="jsonc" type="page">{
-{
     "needLogin": true,
     "layout": "default",
     "style": {
         "navigationStyle": "custom"
     }
-}
+}</route>
-</route>
 
 <template>
     <view class="pb-180rpx">
@@ -17,15 +15,16 @@
         <view>
             <view class="coupon-tab">
                 <wd-tabs v-model="tab" swipeable slidable="always" @click="Collect.handleChangeTab" :lazy="false">
-                    <wd-tab title="茶室"></wd-tab>
+                    <!-- <wd-tab title="茶室"></wd-tab> -->
                     <!-- TODO 茶艺师内容先隐藏 -->
-                    <!-- <wd-tab title="茶艺师"></wd-tab> -->
+                    <wd-tab title="茶艺师"></wd-tab>
                 </wd-tabs>
 
                 <view class="">
-                    <mescroll-body @init="mescrollInit" :down="downOption" @down="downCallback" :up="upOption" @up="Collect.upCallback" top="28rpx">
+                    <mescroll-body @init="mescrollInit" :down="downOption" @down="downCallback" :up="upOption"
+                        @up="Collect.upCallback" top="28rpx">
                         <!-- 茶室列表 -->
-                        <template v-if="tab === 0">
+                        <!-- <template v-if="tab === 0">
                             <view class="relative p-20rp mb-24rpx" v-for="(item, index) in list" :key="index" @click="Collect.handleToTeaRoom(item.tea_store_id)">
                                 <view class="absolute top--28rpx left-0 z-1">
                                     <wd-img width="110rpx" height="110rpx" :src="`${OSS}images/home/home_image4.png`"/>
@@ -65,56 +64,100 @@
                                     </view>
                                 </view>
                             </view>
-                        </template>
+                        </template> -->
 
                         <!-- 茶艺师列表 -->
-                        <template v-if="tab === 1">
+                        <template v-if="tab === 0">
-                            <view class="flex items-center bg-white p-20rpx rounded-10rpx mx-30rpx mb-20rpx">
+                            <view class="flex items-center bg-white p-20rpx rounded-10rpx mx-30rpx mb-20rpx relative"
-                                <view class="mr-28rpx relative">
+                                v-for="(item, index) in list" :key="index">
-                                    <wd-img width="200rpx" height="200rpx" :src="`${OSS}images/home/home_image5.png`"></wd-img>
+                                <view class="mr-28rpx relative z-2" @click="Collect.handlePreviewImage(item.image)">
-                                    <view class="tea-specialist-time absolute top-6rpx left-0 text-[#fff] font-400 text-18rpx leading-26rpx flex items-center justify-center">
+                                    <wd-img width="260rpx" height="320rpx" :src="item.image" mode="aspectFill"
-                                        可约9:00
+                                        radius="10rpx"></wd-img>
+                                    <view
+                                        class="tea-specialist-time absolute z-3 top-26rpx left-0 bg-[#4C9F44] text-[#fff] font-400 text-18rpx flex items-center justify-center">
+                                        <text v-if="item.state == 0">可约</text>
+                                        <text v-if="item.state == 1">工作中</text>
+                                        <text v-if="item.state == 2">不可约</text>
                                     </view>
                                 </view>
-                                <view class="flex-1">
+                                <view class="flex-1"
+                                    @click="Collect.handleReserveTeaSpecialist(item.team_user_id, item.state)">
+
                                     <view class="flex items-center justify-between">
-                                        <view class="font-bold text-[#303133] text-30rpx leading-42rpx mr-14rpx">
+                                        <view class="flex items-center mb-8rpx">
-                                            凝香茶业
+                                            <view class="font-bold text-[#303133] text-30rpx leading-42rpx mr-12rpx">
+                                                {{ item.name }}
                                             </view>
-                                        <view class="w-168rpx h-40rpx relative mr-44rpx">
+                                            <view class="flex items-center">
-                                            <view class="absolute left-0 top-0 h-36rpx flex items-start">
+                                                <wd-icon name="star-on" size="22rpx" color="#FF5951"></wd-icon>
-                                                <wd-img :src="`${OSS}icon/icon_gold_medal.png`" width="36rpx" height="36rpx"></wd-img>
+                                                <view class="font-400 text-24rpx text-[#FF5951] leading-34rpx ml-6rpx">
+                                                    {{ item.star }}
                                                 </view>
-                                            <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 @click.stop="Collect.handleCancelTeaRoom(1)">
+                                        </view>
+
+                                        <view @click.stop="Collect.handleCancelTeamaster(item.team_user_id)">
                                             <wd-icon name="heart-filled" size="22px" color="#F65353"></wd-icon>
                                         </view>
                                     </view>
 
-                                    <view class="flex items-center">
+
-                                        <view class="mr-12rpx">
+                                    <view class="flex items-center mb-14rpx">
-                                            <wd-tag color="#40AE36" bg-color="#40AE36" plain custom-class="!rounded-4rpx">上门服务</wd-tag>
+                                        <!-- 到店服务标签 -->
+                                        <view class="mr-12rpx" v-if="item.server_type == 1 || item.server_type == 3">
+                                            <wd-tag color="#F55726" bg-color="#F55726" plain
+                                                custom-class="!rounded-4rpx">到店服务</wd-tag>
                                         </view>
-                                        <view class="mr-12rpx">
+
-                                            <wd-tag color="#F55726" bg-color="#F55726" plain>到点服务</wd-tag>
+                                        <!-- 上门服务标签 -->
+                                        <view class="mr-12rpx" v-if="item.server_type == 2 || item.server_type == 3">
+                                            <wd-tag color="#40AE36" bg-color="#40AE36" plain
+                                                custom-class="!rounded-4rpx">上门服务</wd-tag>
                                         </view>
+
                                         <view class="mr-12rpx">
-                                            <wd-tag color="#818CA9" bg-color="#F3F3F3">28岁</wd-tag>
+                                            <wd-tag color="#818CA9" bg-color="#F3F3F3">{{ item.both }}岁</wd-tag>
                                         </view>
                                         <view class="flex items-center mt-8rpx">
-                                            <wd-img :src="`${OSS}icon/icon_woman.png`" width="28rpx" height="28rpx"></wd-img>
+                                            <wd-img
+                                                :src="item.sex == 1 ? `${OSS}icon/icon_man.png` : `${OSS}icon/icon_woman.png`"
+                                                width="28rpx" height="28rpx"></wd-img>
                                         </view>
                                     </view>
 
-                                    <view class="font-400 text-[#F29747] text-24rpx leading-34rpx mt-20rpx">
+                                    <view class="flex flex-wrap items-center mt-14rpx mb-24rpx">
-                                        100+收藏
+                                        <view
+                                            class="mr-8rpx px-10rpx leading-34rpx font-400 text-24rpx rounded-4rpx mb-14rpx"
+                                            :style="Collect.handleGetLabelStyle(Number(index))"
+                                            v-for="(label, index) in item.label" :key="index">
+                                            {{ label.label_name }}
+                                        </view>
                                     </view>
 
-                                    <view class="font-400 text-[#FF5951] text-26rpx leading-40rpx">
+                                    <view class="flex items-center justify-between mb-8rpx">
-                                        <text class="text-32rpx">￥180</text>
+                                        <view class="mr-20rpx w-200rpx">
+                                            <view class="flex items-center">
+                                                <view class="flex items-center">
+                                                    <wd-img :src="`${OSS}icon/icon_store_cert2.png`" width="30rpx"
+                                                        height="30rpx"></wd-img>
+                                                </view>
+                                                <text class="ml-8rpx font-400 text-24rpx leading-4rpx"
+                                                    :class="item.company_status ? 'text-#4C9F44' : 'text-#303133'">
+                                                    {{ item.company_abv }}
+                                                </text>
+                                            </view>
+                                        </view>
+                                    </view>
+
+                                    <view
+                                        class="font-400 text-[#FF5951] text-26rpx leading-40rpx flex items-center justify-between mt-4rpx">
+                                        <view class="">
+                                            <text class="text-32rpx">￥{{ item.price }}</text>
                                             <text class="text-24rpx">/小时</text>
                                         </view>
+                                        <!-- <view class="font-400 text-22rpx leading-32rpx text-#92928C">{{ item.is_time }}
+                                        </view> -->
+                                    </view>
                                 </view>
                             </view>
                         </template>
@@ -126,32 +169,31 @@
 </template>
 
 <script lang="ts" setup>
-    import {ref} from 'vue'
+import { ref } from 'vue'
-    import {toast} from '@/utils/toast'
+import { toast } from '@/utils/toast'
-	import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
+import { onPageScroll, onReachBottom } from '@dcloudio/uni-app'
-	import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
+import useMescroll from "@/uni_modules/mescroll-uni/hooks/useMescroll.js"
-    import { getCollectTeaRoomList, collectTeaRoom } from '@/api/tea-room'
+import { getCollectTeaRoomList, collectTeaRoom } from '@/api/tea-room'
+import { getCollectTeaSpecialistList, collectTeaSpecialist } from '@/api/tea-specialist'
+import { router, previewImage } from '@/utils/tools'
 
-    const tab = ref<number>(0)
+const tab = ref<number>(0)
-	const OSS = inject('OSS')
+const OSS = inject('OSS')
 
-  	// 分页
+// 分页
-	const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
+const { mescrollInit, downCallback, getMescroll } = useMescroll(onPageScroll, onReachBottom) // 调用mescroll的hook
-	const downOption = {
+const downOption = {
     auto: true
-	}
+}
-	const upOption = {
+const upOption = {
     auto: true,
     textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
-	}
+}
-	const list = ref<Array<any>>([])
+const list = ref<Array<any>>([])
 
+onLoad((args) => { })
 
-    onLoad((args) => {
+const Collect = {
-
-    })
-
-    const Collect = {
     // 上拉加载的回调: 其中num:当前页 从1开始, size:每页数据条数,默认10
     upCallback: (mescroll) => {
         const filter = {
@@ -159,15 +201,29 @@
             size: mescroll.size,
         }
 
-			getCollectTeaRoomList(filter).then( res => {
+        console.log("🚀 ~ tab.value:", tab.value)
+        // if (tab.value == 0) {
+        //     getCollectTeaRoomList(filter).then( res => {
+        //         console.log("🚀 ~ res:", res)
+        //         const curPageData = res.list || [] // 当前页数据
+        //         if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
+        //         list.value = list.value.concat(curPageData) //追加新数据
+        //         mescroll.endSuccess(curPageData.length, Boolean(res.more))
+        //     }).catch(() => {
+        //         mescroll.endErr() // 请求失败, 结束加载
+        //     })
+        // } else 
+        if (tab.value == 0) {
+            getCollectTeaSpecialistList(filter).then(res => {
                 console.log("🚀 ~ res:", res)
                 const curPageData = res.list || [] // 当前页数据
-				if(mescroll.num == 1) list.value = [] // 第一页需手动制空列表
+                if (mescroll.num == 1) list.value = [] // 第一页需手动制空列表
                 list.value = list.value.concat(curPageData) //追加新数据
                 mescroll.endSuccess(curPageData.length, Boolean(res.more))
             }).catch(() => {
                 mescroll.endErr() // 请求失败, 结束加载
             })
+        }
     },
 
     // 切换tab
@@ -196,17 +252,55 @@
     // 取消收藏茶艺师
     handleCancelTeaSpecialist: (item: any) => {
         toast.info('取消收藏成功')
+    },
+
+    handleGetLabelStyle: (index: number) => {
+        const firstThreeStyles = [
+            { backgroundColor: '#FAF1F1', color: '#CE295A' },
+            { backgroundColor: '#F1F3FA', color: '#2934CE' },
+            { backgroundColor: '#F1FAF9', color: '#29C9CE' },
+        ]
+
+        return firstThreeStyles[index] || { backgroundColor: '#F3F3F3', color: '#818CA9' }
+    },
+
+    /**
+     * 预约茶艺师
+     * @param id 
+     * @param state 茶艺师状态： 0：可约 1：工作中
+     */
+    handleReserveTeaSpecialist: (id: number, state: number) => {
+        router.navigateTo(`/bundle_b/pages/tea-specialist/detail?id=${id}`)
+    },
+
+    /**
+     * 预览图片
+     */
+    handlePreviewImage: (img: any) => {
+        previewImage(img, [img])
+    },
+
+    // 取消收藏茶艺师
+    handleCancelTeamaster: async (id: number) => {
+        await collectTeaSpecialist({
+            id,
+            status: 0
+        })
+        toast.info('取消收藏成功')
+        list.value = []
+        getMescroll().resetUpScroll()
     }
-    }
+}
 </script>
 
 <style lang="scss">
-    page {
+page {
     background-color: $cz-page-background;
-    }
+}
 
-    .coupon-tab {
+.coupon-tab {
     :deep() {
+
         .wd-tabs,
         .wd-tabs__nav,
         .wd-tabs__line {
@@ -217,12 +311,12 @@
             display: none !important;
         }
     }
-    }
+}
 
-    .tea-specialist-time {
+.tea-specialist-time {
     width: 106rpx;
     height: 38rpx;
     background-image: url(#{$OSS}images/collect/collect_image1.png);
     background-size: 100% 100%;
-    }
+}
 </style>

src/bundle/package/service.vue

@@ -25,7 +25,7 @@
                                 <wd-radio :value="1" border>
                                     <view class="leading-36rpx font-400 text-30rpx ml-12rpx mr-60rpx">到店服务</view>
                                 </wd-radio>
-                                <wd-radio :value="2" border>
+                                <wd-radio :value="2" border v-if="setting.status == 1">
                                     <view class="leading-36rpx font-400 text-30rpx ml-12rpx">上门服务</view>
                                 </wd-radio>
                             </wd-radio-group>
@@ -156,6 +156,7 @@ import { getHomeTeaStoreList } from '@/api/tea-room'
 import type { ITeaHouseListResult } from '@/api/types/tea'
 import type { IUserAddressListResult } from '@/api/types/user'
 import { getUserAddress } from '@/api/user'
+import { getSetting } from '@/api/tea-specialist'
 
 const OSS = inject('OSS')
 
@@ -175,9 +176,13 @@ const upOption = {
     textNoMore: '~ 已经到底啦 ~', //无更多数据的提示
 }
 
+const setting = ref<any>({})
+
 onLoad((args) => {
     // 初始化地址列表
     Service.handleInitAddress()
+    // 初始化设置
+    Service.handleInitSetting()
 })
 
 const Service = {
@@ -209,6 +214,16 @@ const Service = {
         addressList.value = Array.isArray(res) ? res : []
     },
 
+    /**
+     * 初始化设置
+     */
+    handleInitSetting: async () => {
+        const res = await getSetting()
+        setting.value = res || {}
+        console.log("🚀 ~ res:", setting.value.status)
+
+    },
+
     // 搜索
     handleSearch: () => {
         list.value = [] 

src/bundle/settle-in/tea-specialist.vue

@@ -168,13 +168,35 @@
                     </view>
                 </view>
 
+                <!-- 茶艺师资格证书 -->
+                <view class="bg-white rounded-16rpx px-30rpx py-28rpx mt-20rpx">
+                    <view class="flex items-center">
+                        <view class="text-32rpx leading-44rpx text-#303133 mr-10rpx">茶艺师资格证书</view>
+                        <view class="flex items-center">
+                            <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`"></wd-img>
+                        </view>
+                    </view>
+                    <view class="mt-32rpx flex items-center">
+                        <wd-upload
+                            :header="{'token': token}"
+                            v-model:file-list="fileList"
+                            :limit="1"
+                            image-mode="scaleToFill"
+                            :action="action">
+                            <view class="border-2rpx border-dashed border-[#E5E5E5] w-184rpx h-184rpx flex flex-col items-center justify-center rounded-16rpx">
+                                <view>
+                                    <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_upload.png`" mode="aspectFill" />
+                                </view>
+                                <view class="font-400 text-26rpx leading-36rpx text-#303133">资格证书</view>
+                            </view>
+                        </wd-upload>
+                    </view>
+                </view>
+
                 <!-- 身份证 -->
                 <view class="bg-white rounded-16rpx px-30rpx py-28rpx mt-20rpx">
                     <view class="flex items-center">
                         <view class="text-32rpx leading-44rpx text-#303133 mr-10rpx">身份证</view>
-                        <view class="flex items-center">
-                            <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`"></wd-img>
-                        </view>
                     </view>
                     <view class="mt-32rpx flex items-center gap-16rpx">
                         <wd-upload
@@ -207,32 +229,6 @@
                     </view>
                 </view>
 
-
-                <!-- 茶艺师资格证书 -->
-                <view class="bg-white rounded-16rpx px-30rpx py-28rpx mt-20rpx">
-                    <view class="flex items-center">
-                        <view class="text-32rpx leading-44rpx text-#303133 mr-10rpx">茶艺师资格证书</view>
-                        <view class="flex items-center">
-                            <wd-img width="16rpx" height="16rpx" :src="`${OSS}icon/icon_validate.png`"></wd-img>
-                        </view>
-                    </view>
-                    <view class="mt-32rpx flex items-center">
-                        <wd-upload
-                            :header="{'token': token}"
-                            v-model:file-list="fileList"
-                            :limit="1"
-                            image-mode="scaleToFill"
-                            :action="action">
-                            <view class="border-2rpx border-dashed border-[#E5E5E5] w-184rpx h-184rpx flex flex-col items-center justify-center rounded-16rpx">
-                                <view>
-                                    <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_upload.png`" mode="aspectFill" />
-                                </view>
-                                <view class="font-400 text-26rpx leading-36rpx text-#303133">资格证书</view>
-                            </view>
-                        </wd-upload>
-                    </view>
-                </view>
-
                 <!-- 个人照片 -->
                 <view class="bg-white rounded-16rpx px-30rpx py-28rpx mt-20rpx">
                     <view class="flex items-center">

src/bundle_b/pages/tea-specialist/detail.vue

@@ -83,6 +83,21 @@
                         </view>
                     </view>
                 </template>
+                <template #right>
+					<view class="flex items-center" :style="{ paddingRight: rightPadding }">
+                        <view class="mr-16rpx flex items-center" @click="Detail.handleCollect">
+                            <template v-if="info.collect > 0">
+                                <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_sc_s.png`"></wd-img>
+                            </template>
+                            <template v-else>
+                                <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_sc.png`"></wd-img>
+                            </template>
+                        </view>
+                        <!-- <view @click="Detail.handleShare" class="flex items-center">
+						    <wd-img width="64rpx" height="64rpx" :src="`${OSS}icon/icon_share.png`"></wd-img>
+                        </view> -->
+					</view>
+				</template>
             </navbar>
         </view>
 
@@ -376,7 +391,7 @@
 <script lang="ts" setup>
 import TeaSpecialistLevel from '@/components/TeaSpecialistLevel.vue'
 import { useMessage } from 'wot-design-uni'
-import { getTeaSpecialistDetail } from '@/api/tea-specialist'
+import { getTeaSpecialistDetail, collectTeaSpecialist } from '@/api/tea-specialist'
 import { ITeaSpecialistDetailsFields } from '@/api/types/tea'
 import type { ITeaSpecialistRewardAmountsResult } from '@/api/types/tea'
 import { toast } from '@/utils/toast'
@@ -386,6 +401,7 @@ import { useUserStore } from '@/store'
 import type { IUserInfoVo } from '@/api/types/login'
 
 const OSS = inject('OSS')
+const rightPadding = inject('capsuleOffset')
 
 // tab
 const tab = ref<number>(0)
@@ -420,6 +436,7 @@ const info = ref({
     license_img: '', // 营业执照图片
     health_certificate: '', // 健康证图片
     state: 0, // 茶艺师状态 0可约 1工作中 2不可约
+    collect: 0, // 是否收藏
 })
 const latitude = ref<number>(0) // 纬度
 const longitude = ref<number>(0) // 经度
@@ -495,6 +512,7 @@ const Detail = {
      */
     handleGetTeaSpecialistDetail: async () => {
         const res = await getTeaSpecialistDetail({
+            user_id: userInfo.value.id,
             team_user_id: id.value,
             latitude: uni.getStorageSync('latitude') || import.meta.env.VITE_DEFAULT_LATITUDE,
             longitude: uni.getStorageSync('longitude') || import.meta.env.VITE_DEFAULT_LONGITUDE,
@@ -503,16 +521,25 @@ const Detail = {
     },
 
     /**
-     * TODO 处理收藏-暂时不要
+     * 处理收藏
      */
     handleCollect: async () => {
-        // let status = info.collect == 0 ? 1 : 0
+    console.log("🚀 ~ Detail.handleCollect:", 123)
-        // await collectTeaSpecialist({
-        //     id: id.value,
-        //     status
-        // })
 
-        // info.collect = info.collect == 0 ? 1 : 0
+        if (!userInfo.value.id) {
+            toast.info('请先登录')
+            router.navigateTo('/pages/login/login', 200)
+        }
+        
+        await Detail.handleGetTeaSpecialistDetail()
+
+        let status = info.value.collect == 0 ? 1 : 0
+        await collectTeaSpecialist({
+            id: id.value,
+            status
+        })
+
+        info.value.collect = status
     },
 
     /**

src/pages/index/index.vue

@@ -89,9 +89,9 @@
 					></wd-swiper>
 			</view>
 
-			<view class="text-36rpx text-[#303133] leading-50rpx mx-30rpx mt-40rpx mb-32rpx font-bold">热门场景</view>
+			<view class="text-36rpx text-[#303133] leading-50rpx mx-30rpx mt-40rpx mb-32rpx font-bold" v-if="setting.status == 1">热门场景</view>
 
-			<view class="package-row px-30rpx">
+			<view class="package-row px-30rpx" v-if="setting.status == 1">
 				<view class="grid grid-cols-3 gap-x-0 gap-y-20rpx">
 					<view
 						v-for="(item, idx) in teaPackageList"
@@ -120,7 +120,7 @@
 			</view>
 
 			<!-- 专属定制 -->
-			<view class="flex justify-center mt-24rpx" @click="router.navigateTo(`/bundle_b/pages/tea-specialist/list`)">
+			<view class="flex justify-center mt-24rpx" @click="router.navigateTo(`/bundle_b/pages/tea-specialist/list`)" v-if="setting.status == 1">
 				<wd-img :src="`${OSS}images/home/home_image_19.png`" width="690rpx" height="200rpx" mode="scaleToFill" />
 			</view>
 		</view>
@@ -208,6 +208,7 @@
 	import { getHomeTeaStoreList } from '@/api/tea-room'
 	import { useUserStore } from '@/store'
     import { useToast } from 'wot-design-uni'
+	import { getSetting } from '@/api/tea-specialist'
 
 	const OSS = inject('OSS')
 	const navbarHeight = inject('navbarHeight')
@@ -253,6 +254,9 @@
 	//  显示第2种优惠券弹窗
 	const showCoupon2 = ref<boolean>(false)
 
+	// 获取设置
+	const setting = ref<any>({})
+
 	onShow(async () => {
 		// if (canLocation) {
 		// 	const location = await handleGetLocationCity(latitude.value, longitude.value)
@@ -382,6 +386,7 @@
 		 * 初始化首页数据
 		 */
 		handleInit: () => {
+
 			getHomeBannerList().then(res => {
 				swiperList.value = res.list.map(item => item.address)
 			})
@@ -390,6 +395,10 @@
 			getTeaPackageList().then(res => {
 				teaPackageList.value = res
 			})
+
+			getSetting().then(res => {
+				setting.value = res
+			})
 		},
 
 		/**

src/pages/my/my.vue

@@ -57,10 +57,10 @@
 						<view class="font-bold text-36rpx leading-50rpx"> {{ isLogin ? user.coupon_count : '- -' }}</view>
 						<view class="text-24rpx leading-34rpx">优惠券</view>
 					</view>
-					<!-- <view class="w-160rpx text-[#303133] text-center" @click="router.navigateTo('/bundle/collect/collect')">
+					<view class="w-160rpx text-[#303133] text-center" @click="router.navigateTo('/bundle/collect/collect')">
 						<view class="font-bold text-36rpx leading-50rpx"> {{ isLogin ? user.collect_count : '- -' }}</view>
 						<view class="text-24rpx leading-34rpx">收藏</view>
-					</view> -->
+					</view>
 				</view>
 				<view class="relative">
 					<view class="w-378rpx h-148rpx">