From 214faad467bb4f9d3fd74ce7b0544bf7ba83504e Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 29 Mar 2023 09:37:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=A4=A7=E5=8E=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppCircle/Detail.vue      | 63 +++++++++++++++++++-
 src/project/fengdu/AppCircle/TopicDetail.vue |  3 +-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/src/project/fengdu/AppCircle/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue
index b8cc8e1..aa2343e 100644
--- a/src/project/fengdu/AppCircle/Detail.vue
+++ b/src/project/fengdu/AppCircle/Detail.vue
@@ -7,10 +7,31 @@ div<template>
           <h3>{{ info.createUserName }}</h3>
           <span v-if="info.publishDepartName">{{ info.publishDepartName }}</span>
         </div>
+        <div class="top-btn" v-if="info.integralTaskId" @click="$linkTo(`/mods/AppNewFarmerBank/taskDetail?id=${info.integralTaskId}`)">去参与</div>
       </div>
       <div class="item-content">
         <span v-if="name" @click="toTopic('./TopicDetail?themeId=' + themeId + '&name=' + name)">#【{{ name }}】</span>
-        <text>{{ info.content }}</text>
+        <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="">进场时间：</div>
+          <div class="value">{{ info.integralTaskInfo.intoBegintime }}至{{ info.integralTaskInfo.intoEndtime }}</div>
+        </div>
+        <div class="info-flex">
+          <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" />
@@ -616,6 +637,7 @@ div<template>
     & > .top {
       padding: 32px 32px 0;
       background: #ffffff;
+      position: relative;
 
       .item-top {
         display: flex;
@@ -641,6 +663,7 @@ div<template>
           font-size: 28px;
         }
       }
+      
 
       .item-imgs {
         display: flex;
@@ -706,6 +729,44 @@ div<template>
           color: #333333;
         }
       }
+
+      .info-flex {
+        display: flex;
+        color: #666;
+        font-size: 24px;
+        font-family: "PingFang SC";
+        line-height: 30px;
+        margin-bottom: 16px;
+        .label {
+          width: 160px;
+          img {
+            width: 30px;
+            height: 30px;
+            margin-right: 8px;
+            vertical-align: bottom;
+          }
+        }
+        .value {
+          width: calc(100% - 160px);
+          color: #333;
+          vertical-align: text-top;
+        }
+      }
+
+      .top-btn {
+        width: 154px;
+        height: 56px;
+        line-height: 56px;
+        text-align: center;
+        background-color: #2E7DFF;
+        border-radius: 28px;
+        color: #fff;
+        font-size: 30px;
+        font-family: "PingFang SC";
+        position: absolute;
+        top: 52px;
+        right: 32px;
+      }
     }
   }
 </style>
diff --git a/src/project/fengdu/AppCircle/TopicDetail.vue b/src/project/fengdu/AppCircle/TopicDetail.vue
index be7d67f..3a98dd3 100644
--- a/src/project/fengdu/AppCircle/TopicDetail.vue
+++ b/src/project/fengdu/AppCircle/TopicDetail.vue
@@ -20,7 +20,8 @@
           </div>
         </div>
         <div class="item-content">
-          <text>{{ item.content }}</text>
+          <text v-if="item.integralTaskId">{{ item.integralTaskInfo.detail }}</text>
+          <text v-else>{{ item.content }}</text>
         </div>
         <div class="item-imgs" v-if="item.files.length">
           <image mode="aspectFill" hover-stop-propagation @click.stop="previewImage(e.url, item.files)" v-for="(e, i) in item.files" :key="i" :src="e.url" />