From e2d3ac1666d0880a7c07989b6d607e0ac7c1e5bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8A=B1=E6=9C=89=E6=B8=85=E9=A6=99=E6=9C=88=E6=9C=89?=
 =?UTF-8?q?=E9=98=B4?= <185154740@qq.com>
Date: Wed, 5 Jan 2022 17:53:36 +0800
Subject: [PATCH] 26392

---
 src/apps/AppVillageDiscuss/Detail.vue | 120 ++++++++++++++------------
 1 file changed, 66 insertions(+), 54 deletions(-)

diff --git a/src/apps/AppVillageDiscuss/Detail.vue b/src/apps/AppVillageDiscuss/Detail.vue
index 9bceba74..d57cc97c 100644
--- a/src/apps/AppVillageDiscuss/Detail.vue
+++ b/src/apps/AppVillageDiscuss/Detail.vue
@@ -2,13 +2,12 @@
   <div class="Detail">
     <AiTopFixed>
       <div flex class="w-100">
-        <div class="avatar" v-text="data.avatar"/>
+        <div class="avatar" v-text="data.avatar" />
         <div flex class="column start fill">
-          <b class="color-333" v-text="data.createUserName"/>
-          <span class="color-999" v-text="data.createTime"/>
+          <b class="color-333" v-text="data.createUserName" />
+          <span class="color-999" v-text="data.createTime" />
         </div>
-        <div class="statusTag" :class="{over:data.status>0}"
-             v-text="data.status==0? data.type==0?'征集中':'投票中':$dict.getLabel('discussStatus',data.status)"/>
+        <div class="statusTag" :class="{ over: data.status > 0 }" v-text="data.status == 0 ? (data.type == 0 ? '征集中' : '投票中') : $dict.getLabel('discussStatus', data.status)" />
       </div>
       <div class="header-middle">
         <div class="contsnts">
@@ -16,30 +15,33 @@
         </div>
       </div>
       <div class="img-list" v-if="data.images && data.images.length && data.contentType != 1">
-        <img :src="item.accessUrl" alt="" v-for="(item, index) in data.images" :key="index"
-             @click="previewImage(data.images, item.accessUrl)"/>
+        <img :src="item.accessUrl" alt="" v-for="(item, index) in data.images" :key="index" @click="previewImage(data.images, item.accessUrl)" />
       </div>
       <div class="img-list" v-if="data.images && data.images.length && data.contentType == 1">
         <video class="video" :src="data.images[0].url"></video>
       </div>
     </AiTopFixed>
-    <div v-if="data.type==0" class="comments">
-      <b class="total" v-text="`全部评论(${commentCount})`"/>
+    <div v-if="data.type == 0" class="comments">
+      <span class="totalCount">
+        <span class="total" v-text="`全部评论(${commentCount})`" />
+        <span class="rightCount">
+          <u-icon name="clock"></u-icon>
+          <u-count-down :timestamp="timestamp" separator="zh" show-days show-hours show-minutes show-seconds></u-count-down>
+        </span>
+      </span>
       <div v-for="op in data.messages" :key="op.id">
         <div flex class="header">
-          <u-avatar :src="op.avatar" size="48"/>
-          <b class="fill" v-text="op.createUserName"/>
-          <u-icon name="thumb-up" :label="op.suport"/>
+          <u-avatar :src="op.avatar" size="48" />
+          <b class="fill" v-text="op.createUserName" />
+          <u-icon name="thumb-up" :label="op.suport" />
         </div>
-        <div class="content" v-text="op.content"/>
-        <div class="content color-999" v-text="op.createTime"/>
+        <div class="content" v-text="op.content" />
+        <div class="content color-999" v-text="op.createTime" />
       </div>
     </div>
-    <div v-else-if="data.type==1" class="comments">
-
-    </div>
+    <div v-else-if="data.type == 1" class="comments"></div>
     <div class="bottomBar">
-      <div v-if="data.status<2" @click="handleComplete">结束公示</div>
+      <div v-if="data.status < 2" @click="handleComplete">结束公示</div>
     </div>
   </div>
 </template>
@@ -52,27 +54,28 @@ export default {
     return {
       data: {},
       id: '',
+      timestamp: '',
     }
   },
   computed: {
     commentCount() {
       return this.data.messages?.length || 0
-    }
+    },
   },
   watch: {},
   onLoad(o) {
     this.id = o.id
     this.getDetail()
-    this.$dict.load("discussStatus")
+    this.$dict.load('discussStatus')
   },
   onShow() {
-    document.title = "议事详情"
+    document.title = '议事详情'
   },
   methods: {
     previewImage(images, img) {
       uni.previewImage({
-        urls: images.map(v => v.url),
-        current: img
+        urls: images.map((v) => v.url),
+        current: img,
       })
     },
     getDetail() {
@@ -80,39 +83,45 @@ export default {
         if (res?.data) {
           this.data = {
             ...res.data,
-            avatar: res.data.createUserName?.substr(0, 2) || "游客",
+            avatar: res.data.createUserName?.substr(0, 2) || '游客',
             images: JSON.parse(res.data.images),
-            messages: res.data.messages || []
+            messages: res.data.messages || [],
           }
+          this.timestamp = new Date(res.data.discussDeadline).getTime()
         }
       })
     },
     handleSubmitComment(content) {
       if (!!content) {
-        let {id} = this
-        this.$http.post("/app/appvillagediscussmessage/addOrUpdate", {
-          id, content
-        }).then(res => {
-          if (res?.code == 0) {
-            this.$u.toast("提交成功!")
-            this.getDetail()
-          }
-        })
+        let { id } = this
+        this.$http
+          .post('/app/appvillagediscussmessage/addOrUpdate', {
+            id,
+            content,
+          })
+          .then((res) => {
+            if (res?.code == 0) {
+              this.$u.toast('提交成功!')
+              this.getDetail()
+            }
+          })
       } else {
-        this.$u.toast("不能提交空评论!")
+        this.$u.toast('不能提交空评论!')
       }
     },
     handleComplete() {
-      this.$confirm("是否要结束公示").then(() => {
-        let {id} = this
-        this.$http.post("/app/appvillagediscuss/finishPublic", {id}).then(res => {
-          if (res?.code == 0) {
-            this.$u.toast("已结束公示!")
-            this.getDetail()
-          }
+      this.$confirm('是否要结束公示')
+        .then(() => {
+          let { id } = this
+          this.$http.post('/app/appvillagediscuss/finishPublic', { id }).then((res) => {
+            if (res?.code == 0) {
+              this.$u.toast('已结束公示!')
+              this.getDetail()
+            }
+          })
         })
-      }).catch(() => 0)
-    }
+        .catch(() => 0)
+    },
   },
 }
 </script>
@@ -124,7 +133,7 @@ export default {
   padding-bottom: 112px;
 
   ::v-deep.AiTopFixed {
-    border-bottom: 16px solid #F6F7F9;
+    border-bottom: 16px solid #f6f7f9;
 
     .avatar {
       height: 64px;
@@ -153,8 +162,8 @@ export default {
     .statusTag {
       padding: 0 12px;
       line-height: 30px;
-      border: 1px solid #2573FF;
-      color: #2573FF;
+      border: 1px solid #2573ff;
+      color: #2573ff;
       font-size: 22px;
 
       &.over {
@@ -193,7 +202,7 @@ export default {
       .title {
         width: 100%;
         line-height: 112px;
-        background: #FFF;
+        background: #fff;
         font-size: 32px;
         font-family: PingFangSC-Regular, PingFang SC;
         color: #999;
@@ -208,13 +217,16 @@ export default {
   .comments {
     padding: 0 32px;
     font-size: 28px;
-
-    .total {
-      display: block;
-      font-size: 30px;
-      height: 120px;
+    .totalCount {
+      display: flex;
+      justify-content: space-between;
       padding-top: 44px;
-      box-sizing: border-box;
+      .total {
+        display: block;
+        font-size: 30px;
+        height: 120px;
+        box-sizing: border-box;
+      }
     }
 
     .u-avatar {