From a7f282691fa01a9cad623a941c23849d45012def Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 11 Mar 2024 14:50:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A9=9A=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppCircle/Detail.vue | 43 +++++++++++++++++++------
 src/project/wuxi/AppCircle/Detail.vue   |  6 ++--
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/project/fengdu/AppCircle/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue
index 15501a2..16e3fcc 100644
--- a/src/project/fengdu/AppCircle/Detail.vue
+++ b/src/project/fengdu/AppCircle/Detail.vue
@@ -1,11 +1,13 @@
 <template>
   <div class="Detail" v-if="pageShow">
     <div class="top">
-      <div class="item-top">
-        <image :src="info.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
-        <div class="right">
-          <h3>{{ info.createUserName }}</h3>
-          <span v-if="info.publishDepartName">{{ info.publishDepartName }}</span>
+      <div :class="info.themeInfo.title == '婚礼' ? 'top-pad marry-css' : 'top-pad'">
+        <div class="item-top">
+          <image :src="info.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
+          <div class="right">
+            <h3>{{ info.createUserName }}</h3>
+            <span v-if="info.publishDepartName">{{ info.publishDepartName }}</span>
+          </div>
         </div>
         <image src="https://cdn.cunwuyun.cn/fengdu/marry-top.png" class="marry-top" v-if="name == '婚礼'" />
         <div class="item-content">
@@ -30,14 +32,14 @@
             <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/leave-icon.png" alt="">离场时间：</div>
             <div class="value">{{ info.integralTaskInfo.exitBegintime }}至{{ info.integralTaskInfo.exitEndtime }}</div>
           </div>
+          <div class="info-flex">
+            <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/time-icon.png" alt="">{{ info.integralTaskInfo.type == 1 ? '报名时间：' : '进场时间：' }}</div>
+            <div class="value">{{ info.integralTaskInfo.intoBegintime }}至{{ info.integralTaskInfo.intoEndtime }}</div>
+          </div>
         </div>
         <!-- <div class="item-imgs" v-if="info.files && info.files.length">
           <image mode="aspectFill" @click="previewImage(item.url, info.files)" v-for="(item, index) in info.files" :key="index" :src="item.url" />
         </div> -->
-        <div class="info-flex">
-          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/time-icon.png" alt="">{{ info.integralTaskInfo.type == 1 ? '报名时间：' : '进场时间：' }}</div>
-          <div class="value">{{ info.integralTaskInfo.intoBegintime }}至{{ info.integralTaskInfo.intoEndtime }}</div>
-        </div>
         <div class="time-flex">
           <p>{{ info.createTime }}</p>
           <image src="https://cdn.cunwuyun.cn/fengdu/marry-bottom.png" class="marry-bottom" v-if="name == '婚礼'" />
@@ -757,5 +759,28 @@ export default {
       right: 32px;
     }
   }
+  .top-pad {
+    padding: 32px;
+  }
+  .marry-css {
+    background-image: linear-gradient(191deg, #FFE0E4 0%, #FFFFFF 89%);
+    position: relative;
+    .marry-top {
+      width: 216px;
+      height: 100px;
+      position: absolute;
+      top: 18px;
+      right: 12px;
+    }
+    .time-flex {
+      display: flex;
+      justify-content: space-between;
+      .marry-bottom {
+        width: 300px;
+        height: 40px;
+        margin-top: -4px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/project/wuxi/AppCircle/Detail.vue b/src/project/wuxi/AppCircle/Detail.vue
index 2635c4a..6ccbe87 100644
--- a/src/project/wuxi/AppCircle/Detail.vue
+++ b/src/project/wuxi/AppCircle/Detail.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="Detail" v-if="pageShow">
     <div class="top">
-      <div :class="name == '婚礼' ? 'top-pad marry-css' : 'top-pad'">
+      <div :class="info.themeInfo.title == '婚礼' ? 'top-pad marry-css' : 'top-pad'">
         <div class="item-top">
           <image :src="info.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
           <div class="right">
@@ -12,7 +12,7 @@
               @click="toTask">去参与
           </div>
         </div>
-        <image src="https://cdn.cunwuyun.cn/fengdu/marry-top.png" class="marry-top" v-if="name == '婚礼'" />
+        <image src="https://cdn.cunwuyun.cn/fengdu/marry-top.png" class="marry-top" v-if="info.themeInfo.title == '婚礼'" />
         <div class="item-content">
           <span v-if="name" @click="toTopic('./TopicDetail?themeId=' + themeId + '&name=' + name)">#【{{ name }}】</span>
           <text v-if="info.integralTaskId">{{ info.integralTaskInfo.detail }}</text>
@@ -45,7 +45,7 @@
         </div>
         <div class="time-flex">
           <p>{{ info.createTime }}</p>
-          <image src="https://cdn.cunwuyun.cn/fengdu/marry-bottom.png" class="marry-bottom" v-if="name == '婚礼'" />
+          <image src="https://cdn.cunwuyun.cn/fengdu/marry-bottom.png" class="marry-bottom" v-if="info.themeInfo.title == '婚礼'" />
         </div>
       </div>
       <div class="item-bottom">