From 0ade3a59f11277f323f6b336ada60e8ac36125a2 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Mon, 11 Mar 2024 11:59:02 +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       |  97 ++++++++++------
 .../qujing/AppPhotoReport/PhotoDetail.vue     |   3 +-
 src/project/wuxi/AppCircle/Detail.vue         | 104 +++++++++++-------
 3 files changed, 133 insertions(+), 71 deletions(-)

diff --git a/src/project/fengdu/AppCircle/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue
index 7f06088..0b35c4d 100644
--- a/src/project/fengdu/AppCircle/Detail.vue
+++ b/src/project/fengdu/AppCircle/Detail.vue
@@ -1,42 +1,49 @@
 div<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="name == '婚礼' ? 'top-pad marry-css' : 'top-pad'">
+        <div class="item-top">
+          <image :src="info.createUserAvatar || 'https://cdn.cunwuyun.cn/fengdu/avatar.png'" />
+          <div class="right">
+            <h3>{{ info.createUserName }}</h3>
+            <span v-if="info.publishDepartName">{{ info.publishDepartName }}</span>
+          </div>
+          <div class="top-btn" v-if="info.integralTaskId && info.integralTaskInfo.status != 2 && info.showSignBtn" @click="toTask">去参与</div>
         </div>
-        <div class="top-btn" v-if="info.integralTaskId && info.integralTaskInfo.status != 2 && info.showSignBtn" @click="toTask">去参与</div>
-      </div>
-      <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>
-        <text v-else>{{ info.content }}</text>
-      </div>
-      <div v-if="info.integralTaskId">
-        <div class="info-flex">
-          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/address-icon.png" alt="">活动地点：</div>
-          <div class="value">{{ info.integralTaskInfo.address }}</div>
-        </div>
-        <div class="info-flex">
-          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/come-icon.png" alt="">任务类型：</div>
-          <div class="value">{{ info.integralTaskInfo.type == 1 ? '报名得积分' : '打卡得积分' }}</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 class="info-flex" v-if="info.integralTaskInfo.type != 1">
-          <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>
+        <image src="https://cdn.cunwuyun.cn/fengdu/marry-top.png" class="marry-top" v-if="name == '婚礼'" />
+        <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>
+          <text v-else>{{ info.content }}</text>
         </div>
+        <div v-if="info.integralTaskId">
+          <div class="info-flex">
+            <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/address-icon.png" alt="">活动地点：</div>
+            <div class="value">{{ info.integralTaskInfo.address }}</div>
+          </div>
+          <div class="info-flex">
+            <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/come-icon.png" alt="">任务类型：</div>
+            <div class="value">{{ info.integralTaskInfo.type == 1 ? '报名得积分' : '打卡得积分' }}</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 class="info-flex" v-if="info.integralTaskInfo.type != 1">
+            <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>
+        <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="time-flex">
+          <p>{{ info.createTime }}</p>
+          <image src="https://cdn.cunwuyun.cn/fengdu/marry-bottom.png" class="marry-bottom" v-if="name == '婚礼'" />
+        </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>
-      <p>{{ info.createTime }}</p>
+      
       <div class="item-bottom">
         <button open-type="share">
           <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png" />
@@ -647,7 +654,7 @@ div<template>
     }
 
     & > .top {
-      padding: 32px 32px 0;
+      // padding: 32px 32px 0;
       background: #ffffff;
       position: relative;
 
@@ -780,5 +787,29 @@ div<template>
         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/qujing/AppPhotoReport/PhotoDetail.vue b/src/project/qujing/AppPhotoReport/PhotoDetail.vue
index 2730bd0..019e24a 100644
--- a/src/project/qujing/AppPhotoReport/PhotoDetail.vue
+++ b/src/project/qujing/AppPhotoReport/PhotoDetail.vue
@@ -33,6 +33,7 @@
       <AiItem label="性别" :value="$dict.getLabel('sex', info.judgeSex)"/>
       <AiItem label="联系电话" :value="info.judgePhone"/>
       <AiItem label="家庭住址" :value="info.judgeAddress"/>
+      <AiItem label="纠纷类别" :value="$dict.getLabel('qujingDisputeCategory', info.judgeDisputeCategory)"/>
       <AiItem label="排查内容" class="not-line">
         <span v-for="(item, index) in info.judgeRiskList" :key="index">
           <span v-if="index > 0">,</span>{{ $dict.getLabel('qujingRisk', item) }}
@@ -106,7 +107,7 @@ export default {
   onLoad(query) {
     this.id = query.id
     this.getInfo()
-    this.$dict.load(['qujingEventStatus', 'qujingDoStatus', 'qujingEventType', 'sex', 'qujingRisk', 'qujingRiskLevel'])
+    this.$dict.load(['qujingEventStatus', 'qujingDoStatus', 'qujingEventType', 'sex', 'qujingRisk', 'qujingRiskLevel', 'qujingDisputeCategory'])
   },
   methods: {
     getInfo() {
diff --git a/src/project/wuxi/AppCircle/Detail.vue b/src/project/wuxi/AppCircle/Detail.vue
index 74f8aa4..bb39ce0 100644
--- a/src/project/wuxi/AppCircle/Detail.vue
+++ b/src/project/wuxi/AppCircle/Detail.vue
@@ -1,47 +1,53 @@
 <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>
-        <div class="top-btn" v-if="info.integralTaskId && info.integralTaskInfo.status != 2 && info.showSignBtn"
-             @click="toTask">去参与
-        </div>
-      </div>
-      <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>
-        <text v-else>{{ info.content }}</text>
-      </div>
-      <div v-if="info.integralTaskId">
-        <div class="info-flex">
-          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/address-icon.png" alt="">活动地点：</div>
-          <div class="value">{{ info.integralTaskInfo.address }}</div>
-        </div>
-        <div class="info-flex">
-          <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/come-icon.png" alt="">任务类型：</div>
-          <div class="value">{{ info.integralTaskInfo.type == 1 ? '报名得积分' : '打卡得积分' }}</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 :class="name == '婚礼' ? '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 class="top-btn" v-if="info.integralTaskId && info.integralTaskInfo.status != 2 && info.showSignBtn"
+              @click="toTask">去参与
           </div>
-          <div class="value">{{ info.integralTaskInfo.intoBegintime }}至{{ info.integralTaskInfo.intoEndtime }}</div>
         </div>
-        <div class="info-flex" v-if="info.integralTaskInfo.type != 1">
-          <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>
+        <image src="https://cdn.cunwuyun.cn/fengdu/marry-top.png" class="marry-top" v-if="name == '婚礼'" />
+        <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>
+          <text v-else>{{ info.content }}</text>
         </div>
+        <div v-if="info.integralTaskId">
+          <div class="info-flex">
+            <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/address-icon.png" alt="">活动地点：</div>
+            <div class="value">{{ info.integralTaskInfo.address }}</div>
+          </div>
+          <div class="info-flex">
+            <div class="label"><img src="https://cdn.cunwuyun.cn/fengdu/come-icon.png" alt="">任务类型：</div>
+            <div class="value">{{ info.integralTaskInfo.type == 1 ? '报名得积分' : '打卡得积分' }}</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 class="info-flex" v-if="info.integralTaskInfo.type != 1">
+            <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>
+        <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="time-flex">
+          <p>{{ info.createTime }}</p>
+          <image src="https://cdn.cunwuyun.cn/fengdu/marry-bottom.png" class="marry-bottom" v-if="name == '婚礼'" />
+        </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>
-      <p>{{ info.createTime }}</p>
       <div class="item-bottom">
         <button open-type="share">
           <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png"/>
@@ -651,7 +657,7 @@ export default {
   }
 
   & > .top {
-    padding: 32px 32px 0;
+    // padding: 32px 32px 0;
     background: #ffffff;
     position: relative;
 
@@ -786,6 +792,30 @@ export default {
       top: 52px;
       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>