From 91b62b731e3a65a28e2a1ed8d121408cfb01bd0a Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 19 Jul 2024 19:04:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Enjoyableservices/detail.vue | 7 +++----
 src/views/Enjoyableservices/index.vue  | 6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/views/Enjoyableservices/detail.vue b/src/views/Enjoyableservices/detail.vue
index 87a6569..32cc881 100644
--- a/src/views/Enjoyableservices/detail.vue
+++ b/src/views/Enjoyableservices/detail.vue
@@ -8,13 +8,12 @@
                         :text-color="info.expiredFlag ? '#3974F6' : '#AAAAAA'" size="large">{{
                             info.expiredFlag ? "进行中" : "已结束" }}</van-tag>
                     <div class="font-size13 C1 m-left12">{{ info.data }}</div>
-
                 </div>
                 <div class="y66666 font-size15 m-bottom5">享受服务条件：{{ info.resiSearchTagName }}</div>
                 <div class="y66666 font-size15 m-bottom5">服务提供方：{{ info.assignText || '--' }}</div>
                 <div class="flex flex-x ">
-                    <div class="y66666 font-size15 nowrap">服务时间：{{ info.assignInfo.serviceTimeStart }} 至</br>{{
-                        info.assignInfo.serviceTimeEnd }} </div>
+                    <div class="y66666 font-size15 nowrap">服务时间：{{ info.serviceTimeStart || info.assignInfo.serviceTimeStart }} 至</br>{{
+                        info.serviceTimeEnd ||info.assignInfo.serviceTimeEnd }} </div>
                     <div class="y66666 font-size15">{{ info.serviceData }} </div>
                 </div>
                 <van-divider />
@@ -26,7 +25,7 @@
 </template>
 
 <script>
-import { icServicePostRecord, icServiceSkillRecord, icServiceWarmRecord, icServiceRecordV2 } from '@/api/service'
+import { icServicePostRecord, icServiceSkillRecord, icServiceWarmRecord, icServiceRecordV2 ,policyDetail} from '@/api/service'
 
 export default {
     data() {
diff --git a/src/views/Enjoyableservices/index.vue b/src/views/Enjoyableservices/index.vue
index 21488dd..baadd11 100644
--- a/src/views/Enjoyableservices/index.vue
+++ b/src/views/Enjoyableservices/index.vue
@@ -3,9 +3,11 @@
     <div class="container">
         <van-list v-model="loading" :finished="finished" finished-text="没有更多了" @load="myCommonsService" class=""
             :offset="50">
-            <div class="card  m-bottom10" v-for="(item,index) in EnjoyableList" :key="index"  @click="$router.push({ path: `/detailServices`,query:{id:item.serviceId,type:item.serviceType} })"> 
+            <div class="card  m-bottom10" v-for="(item,index) in EnjoyableList" :key="index"  @click="$router.push({ path: `/detailServices`,query:{id:item.serviceId,type:item.categoryCode} })"> 
             <div class="flex flex-x  flex-center2">
-                <van-tag  color="#EBF1FE" text-color="#3974F6" size="large">{{ item.expiredFlag? "进行中":"已结束" }}</van-tag> 
+                <van-tag :color="item.expiredFlag ? '#EBF1FE' : '#F5F5F5'"
+                        :text-color="item.expiredFlag ? '#3974F6' : '#AAAAAA'" size="large">{{
+                            item.expiredFlag ? "进行中" : "已结束" }}</van-tag>
                 <div class="font-size13 C1 m-left12">{{ item.startDate }}</div>
             </div>
             <div class="m-top10">{{ item.title }}</div>