From 21ccd9ff81e9c0dcae10857e090e13aa49690fe5 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Tue, 5 Mar 2024 16:42:47 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qujing/AppPhotoReport/PhotoDetail.vue     | 52 ++++++++++++-------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/project/qujing/AppPhotoReport/PhotoDetail.vue b/src/project/qujing/AppPhotoReport/PhotoDetail.vue
index 2730bd0..6e82181 100644
--- a/src/project/qujing/AppPhotoReport/PhotoDetail.vue
+++ b/src/project/qujing/AppPhotoReport/PhotoDetail.vue
@@ -13,17 +13,17 @@
         <div class="flex wrap">
           <image class="fill imageItem" v-for="(item, index) in info.files" @click="preview(item.url)" :key="index" :src="item.url"/>
         </div>
-        <span v-if="!info.files.length">暂无照片</span>
+        <span v-if="!hasFiles(info.files)">暂无照片</span>
       </AiItem>
     </AiGroup>
-    <u-gap height="24" v-if="result.doExplain" />
+    <u-gap height="24" v-if="result.doExplain"/>
     <AiGroup title="处理详情" description noBorder labelColor="#999" v-if="result.doExplain">
       <AiItem label="处理结果" top-label :value="result.doExplain"/>
       <AiItem label="照片" class="not-line">
         <div class="flex wrap">
           <image class="fill imageItem" v-for="(item, index) in result.files" @click="preview(item.url)" :key="index" :src="item.url"/>
         </div>
-        <span v-if="!result.files.length">暂无照片</span>
+        <span v-if="!hasFiles(result.files)">暂无照片</span>
       </AiItem>
     </AiGroup>
     <!-- <u-gap height="24" v-if="info.judgeName"/>
@@ -49,9 +49,9 @@
       <AiItem label="调处思路、措施及主要过程" :value="info.mediateInfo"/>
       <AiItem label="调处结果" class="not-line" value="调解成功" />
     </AiGroup> -->
-    <u-gap height="24" />
-    <u-tabs :list="evaluation && evaluation.id ? [{name:'办理进度'},{name:'我的评价'}] : [{name:'办理进度'}] " :current="currentTab" @change="v=>currentTab=v"/>
-    <u-gap height="24" bg-color="#fff" />
+    <u-gap height="24"/>
+    <u-tabs :list="tabs" :current="currentTab" @change="v=>currentTab=v"/>
+    <u-gap height="24" bg-color="#fff"/>
     <AiGroup noBorder v-if="currentTab=='0'">
       <AiStep v-for="(item,i) in process" :key="item.id" :index="i">
         <div class="flex start">
@@ -97,8 +97,15 @@ export default {
           systemExplain: `${createUserName}完成评价 (${score}星评价)`
         })
       }
-      return list
-    }
+      return list;
+    },
+    tabs: v => {
+      const tabs = [{name: "办理进度"}];
+      if (!!v.evaluation?.id) {
+        tabs.push({name: "我的评价"});
+      }
+      return tabs;
+    },
   },
   onShow() {
     this.getInfo()
@@ -117,7 +124,7 @@ export default {
           if (['3', '4'].includes(res.data.eventStatus) && res.data.groupName != '矛盾调解') {
             this.result = res.data.processList[0]
           }
-          if(this.info.judgeRisk) {
+          if (this.info.judgeRisk) {
             this.info.judgeRiskList = this.info.judgeRisk.split(',')
           }
         }
@@ -133,11 +140,14 @@ export default {
     preview(url) {
       uni.previewImage({
         urls: this.info.files.map(v => v.url),
-        current: url
-      })
-    }
-  }
-}
+        current: url,
+      });
+    },
+    hasFiles(files) {
+      return files?.length > 0;
+    },
+  },
+};
 </script>
 
 <style lang="scss">
@@ -195,7 +205,7 @@ export default {
       background: #ff883c;
     }
 
-    &.status-1, &.status-2, &.status-evaluation{
+    &.status-1, &.status-2, &.status-evaluation {
       background: #1aaaff;
     }
 
@@ -219,28 +229,34 @@ export default {
       margin-right: 0;
     }
   }
+
   .not-line {
     .AiItem {
       .normal {
-        border: none!important;
-        min-height: 112px!important;
+        border: none !important;
+        min-height: 112px !important;
       }
     }
   }
+
   ::v-deep .AiGroup {
     .groupHeader {
-      padding-top: 16px!important;
+      padding-top: 16px !important;
     }
   }
+
   .level1 {
     color: #3D88F5;
   }
+
   .level2 {
     color: #52C75B;
   }
+
   .level3 {
     color: #FF883C;
   }
+
   .level4 {
     color: #FF3C3C;
   }

From 8a6b5865038539905c7cbf2f11be0c4dcfb012a9 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 6 Mar 2024 14:24:49 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=B8=85=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/extra/AppCircle/Detail.vue     | 24 ++++--------------------
 src/project/fengdu/AppCircle/Detail.vue |  9 ++++-----
 2 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/mods/extra/AppCircle/Detail.vue b/src/mods/extra/AppCircle/Detail.vue
index cdd5314..588df2b 100644
--- a/src/mods/extra/AppCircle/Detail.vue
+++ b/src/mods/extra/AppCircle/Detail.vue
@@ -1,4 +1,4 @@
-div<template>
+<template>
   <div class="Detail" v-if="pageShow">
     <div class="top">
       <div class="item-top">
@@ -115,7 +115,7 @@ div<template>
 			<div class="popup">
         <div class="popup-title">
           <h2>评论</h2>
-          <image @click="isShowComment = false, focus = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png" />
+          <image @click="isShowComment = false,focus = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png" />
         </div>
         <div class="form">
           <textarea :maxlength="100" :cursor-spacing="10" :placeholder="commentId ? '回复' + replyName : '请输入评论内容'" :focus="focus" v-model="content"></textarea>
@@ -133,7 +133,6 @@ div<template>
   export default {
     name: 'Detail',
     appName: '详情',
-
     data () {
       return {
         id: '',
@@ -153,11 +152,9 @@ div<template>
         replyName: ''
       }
     },
-
     computed: {
       ...mapState(['user', 'token'])
     },
-
     onLoad (query) {
       this.isFrom = query.isFrom
       this.id = query.id
@@ -175,10 +172,8 @@ div<template>
         this.getCommontList(query.id)
       }
     },
-
     methods: {
       ...mapActions(['autoLogin']),
-
       toTask() {
         if (!this.user.areaId) {
           this.$dialog.confirm({
@@ -191,14 +186,12 @@ div<template>
         }
         this.$linkTo(`/mods/AppNewFarmerBank/taskDetail?id=${this.info.integralTaskId}`)
       },
-
       previewImage (url, files) {
         uni.previewImage({
           current: url,
           urls: files.map(v => v.url)
         })
       },
-
       showComment () {
         if (!this.user.areaId) {
           this.$dialog.confirm({
@@ -222,7 +215,6 @@ div<template>
           }, 500)
         })
       },
-
       replay (item) {
         if (!this.user.areaId) {
           this.$dialog.confirm({
@@ -247,10 +239,9 @@ div<template>
           }, 500)
         })
       },
-
       getInfo (id) {
         this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
-          withoutToken: this.token ? false : true,
+          withoutToken: !this.token,
         }).then(res => {
           if (res.code === 0) {
             this.info = res.data
@@ -260,7 +251,6 @@ div<template>
           uni.hideLoading()
         })
       },
-
       reciate () {
         this.$loading()
         this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${this.id}`).then(res => {
@@ -272,7 +262,6 @@ div<template>
           uni.hideLoading()
         })
       },
-
       send () {
         if (!this.content) {
           return this.$toast('内容不能为空')
@@ -303,7 +292,6 @@ div<template>
           }
         })
       },
-
       toTopic (url) {
         if (this.isFrom === 'topic') {
           uni.navigateBack({
@@ -313,13 +301,12 @@ div<template>
           this.$linkTo(url)
         }
       },
-
       getCommontList (id) {
         if (this.isMore) return
 
         this.$loading()
         this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
-          withoutToken: this.token ? false : true,
+          withoutToken: !this.token,
           params: {
             id,
             current: this.current,
@@ -349,11 +336,9 @@ div<template>
         })
       }
     },
-
     onReachBottom () {
       this.getCommontList()
     },
-
     onShareTimeline () {
       return {
         title: this.info.content,
@@ -463,7 +448,6 @@ div<template>
           width: 100px;
           height: 60px;
           line-height: 60px;
-          text-align: right;
           text-align: center;
           font-size: 26px;
           color: #fff;
diff --git a/src/project/fengdu/AppCircle/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue
index 7f06088..0942ff7 100644
--- a/src/project/fengdu/AppCircle/Detail.vue
+++ b/src/project/fengdu/AppCircle/Detail.vue
@@ -1,4 +1,4 @@
-div<template>
+<template>
   <div class="Detail" v-if="pageShow">
     <div class="top">
       <div class="item-top">
@@ -250,7 +250,7 @@ div<template>
 
       getInfo (id) {
         this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
-          withoutToken: this.token ? false : true,
+          withoutToken: !this.token,
         }).then(res => {
           if (res.code === 0) {
             this.info = res.data
@@ -319,7 +319,7 @@ div<template>
 
         this.$loading()
         this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
-          withoutToken: this.token ? false : true,
+          withoutToken: !this.token,
           params: {
             id,
             current: this.current,
@@ -463,7 +463,6 @@ div<template>
           width: 100px;
           height: 60px;
           line-height: 60px;
-          text-align: right;
           text-align: center;
           font-size: 26px;
           color: #fff;
@@ -675,7 +674,7 @@ div<template>
           font-size: 28px;
         }
       }
-      
+
 
       .item-imgs {
         display: flex;

From efb18515f52f877140cd5e22fc05f44c2d3325cc Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 6 Mar 2024 15:11:53 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=8D=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A8=A1=E5=BC=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                     | 25 ++++++++++++++-----------
 src/components/utils/modules.js | 13 ++++++++-----
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 47615dc..e36568a 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,17 +2,20 @@
 
 export default {
   onLaunch() {
-    if (!wx.getUpdateManager) return
-    const updateManager = wx.getUpdateManager()
-    updateManager.onUpdateReady(() => {
-      this.$dialog.alert({
-        title: '更新提示',
-        content: '新版本已经准备好，点击确认按钮重启应用！'
-      }).then(() => {
-        updateManager.applyUpdate()
-      }).catch(() => {
-      })
-    })
+    if (uni.getUpdateManager) {
+      const updateManager = uni.getUpdateManager()
+      if (updateManager) {
+        updateManager.onUpdateReady(() => {
+          this.$dialog.alert({
+            title: '更新提示',
+            content: '新版本已经准备好，点击确认按钮重启应用！'
+          }).then(() => {
+            updateManager.applyUpdate()
+          }).catch(() => {
+          })
+        })
+      }
+    }
   },
 }
 </script>
diff --git a/src/components/utils/modules.js b/src/components/utils/modules.js
index 91fbee3..da36cd0 100644
--- a/src/components/utils/modules.js
+++ b/src/components/utils/modules.js
@@ -40,7 +40,10 @@ export const user = {
               reject(res);
             }
           },
-          fail: () => resolve(dispatch("getCode", ++count))
+          fail: err => {
+            console.error(err)
+            resolve(dispatch("getCode", ++count))
+          }
         })
       })
     },
@@ -97,23 +100,23 @@ export const user = {
         uni.navigateTo({url: modulePath});
       } else if (checkType == 4) {
         if (!token) {
-          return dispatch('autoLogin', { loginWay: 'qujing' }).then(() => dispatch('authCheck', { checkType, modulePath }));
+          return dispatch('autoLogin', {loginWay: 'qujing'}).then(() => dispatch('authCheck', {checkType, modulePath}));
         }
         if (!userInfo.areaId) {
           return uni.showModal({
             title: '温馨提示',
             content: '您只有完成信息认证后，才可进行相关操作。',
             confirmText: '去认证',
-            success: (res)=> {
+            success: (res) => {
               if (res.confirm) {
-                uni.reLaunch({ url: `/pages/AppMine/userInfo?isFromTabbar=1&path=/pages/AppHome/AppHome` })
+                uni.reLaunch({url: `/pages/AppMine/userInfo?isFromTabbar=1&path=/pages/AppHome/AppHome`})
               } else if (res.cancel) {
                 // 停留
               }
             }
           })
         }
-        uni.navigateTo({ url: modulePath });
+        uni.navigateTo({url: modulePath});
       }
     }
   }

From ba4904a9cbacf4f08760a5f0eadf54c11ccf4c8e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 6 Mar 2024 15:49:42 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8B=E5=8F=8B?=
 =?UTF-8?q?=E5=9C=88=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/extra/AppCircle/Detail.vue     | 1145 +++++++++++-----------
 src/project/fengdu/AppCircle/Detail.vue | 1147 +++++++++++------------
 src/project/wuxi/AppCircle/Detail.vue   |   39 +-
 3 files changed, 1147 insertions(+), 1184 deletions(-)

diff --git a/src/mods/extra/AppCircle/Detail.vue b/src/mods/extra/AppCircle/Detail.vue
index 588df2b..812038c 100644
--- a/src/mods/extra/AppCircle/Detail.vue
+++ b/src/mods/extra/AppCircle/Detail.vue
@@ -2,7 +2,7 @@
   <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'" />
+        <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>
@@ -24,7 +24,7 @@
           <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="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">
@@ -34,12 +34,12 @@
 
       </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" />
+        <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" />
+          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png"/>
           <i>{{ info.sharedCount }}</i>
         </button>
         <div>
@@ -47,7 +47,7 @@
           <i>{{ info.appreciateCount }}</i>
         </div>
         <div>
-          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png" />
+          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png"/>
           <i>{{ info.commentCount }}</i>
         </div>
       </div>
@@ -56,7 +56,7 @@
       <h2>评论</h2>
       <div class="comment-wrapper">
         <div class="comment-item" v-for="(item, index) in list" :key="index">
-          <image :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
+          <image :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
           <div class="right">
             <h3>{{ item.createUserName }}</h3>
             <p>{{ item.content }}</p>
@@ -66,7 +66,7 @@
             </div>
             <div class="replay-list" v-if="item.replyList.length">
               <div class="replay-item" v-for="replay in item.replyList" :key="replay.id">
-                <image :src="replay.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
+                <image :src="replay.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
                 <div class="replay-item__right">
                   <div class="top">
                     <div class="replay-left">
@@ -90,14 +90,14 @@
       <!-- <div hover-class="hover-class">发送</div> -->
     </div>
     <u-popup v-model="isShow" mode="bottom" hidden height="350rpx" border-radius="30">
-			<div class="popup">
+      <div class="popup">
         <div class="popup-title">
           <h2>请选择</h2>
-          <image @click="isShow = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png" />
+          <image @click="isShow = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png"/>
         </div>
         <div class="popup-list">
           <button open-type="share">
-            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-wechat.png" />
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-wechat.png"/>
             <span>微信</span>
           </button>
           <!-- <button open-type="share">
@@ -110,12 +110,12 @@
           </button> -->
         </div>
       </div>
-		</u-popup>
+    </u-popup>
     <u-popup v-model="isShowComment" mode="bottom" hidden height="400rpx" border-radius="30" @close="focus = false">
-			<div class="popup">
+      <div class="popup">
         <div class="popup-title">
           <h2>评论</h2>
-          <image @click="isShowComment = false,focus = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png" />
+          <image @click="isShowComment = false,focus = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png"/>
         </div>
         <div class="form">
           <textarea :maxlength="100" :cursor-spacing="10" :placeholder="commentId ? '回复' + replyName : '请输入评论内容'" :focus="focus" v-model="content"></textarea>
@@ -124,363 +124,316 @@
           </div>
         </div>
       </div>
-		</u-popup>
+    </u-popup>
   </div>
 </template>
 
 <script>
-  import { mapActions, mapState } from 'vuex'
-  export default {
-    name: 'Detail',
-    appName: '详情',
-    data () {
-      return {
-        id: '',
-        isShow: false,
-        info: {},
-        name: '',
-        themeId: '',
-        isFrom: '',
-        list: [],
-        isMore: false,
-        isShowComment: false,
-        current: 1,
-        content: '',
-        focus: false,
-        pageShow: false,
-        commentId: '',
-        replyName: ''
+import {mapActions, mapState} from 'vuex'
+
+export default {
+  name: 'Detail',
+  appName: '详情',
+  data() {
+    return {
+      id: '',
+      isShow: false,
+      info: {},
+      name: '',
+      themeId: '',
+      isFrom: '',
+      list: [],
+      isMore: false,
+      isShowComment: false,
+      current: 1,
+      content: '',
+      focus: false,
+      pageShow: false,
+      commentId: '',
+      replyName: ''
+    }
+  },
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  onLoad(query) {
+    this.isFrom = query.isFrom
+    this.id = query.id
+    this.themeId = query.themeId
+    this.name = query.name || ''
+
+    this.$loading();
+    (this.token ? Promise.resolve() : this.autoLogin()).finally(() => Promise.all([
+      this.getInfo(query.id),
+      this.getCommontList(query.id)
+    ])).finally(() => this.$hideLoading())
+  },
+  methods: {
+    ...mapActions(['autoLogin']),
+    toTask() {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('../AppMine/userInfo')
+        })
+        return false
       }
+      this.$linkTo(`/mods/AppNewFarmerBank/taskDetail?id=${this.info.integralTaskId}`)
     },
-    computed: {
-      ...mapState(['user', 'token'])
+    previewImage(url, files) {
+      uni.previewImage({
+        current: url,
+        urls: files.map(v => v.url)
+      })
     },
-    onLoad (query) {
-      this.isFrom = query.isFrom
-      this.id = query.id
-      this.themeId = query.themeId
-      this.name = query.name || ''
-
-      this.$loading()
-      if (!this.token) {
-        this.autoLogin().then(() => {
-          this.getInfo(query.id)
-          this.getCommontList(query.id)
-        })
-      } else {
-        this.getInfo(query.id)
-        this.getCommontList(query.id)
-      }
-    },
-    methods: {
-      ...mapActions(['autoLogin']),
-      toTask() {
-        if (!this.user.areaId) {
-          this.$dialog.confirm({
-            content: '您只有完成信息认证后，才可进行相关操作。',
-            confirmText: '去认证'
-          }).then(() => {
-            this.$linkTo('../AppMine/userInfo')
-          })
-          return false
-        }
-        this.$linkTo(`/mods/AppNewFarmerBank/taskDetail?id=${this.info.integralTaskId}`)
-      },
-      previewImage (url, files) {
-        uni.previewImage({
-          current: url,
-          urls: files.map(v => v.url)
-        })
-      },
-      showComment () {
-        if (!this.user.areaId) {
-          this.$dialog.confirm({
-            content: '您只有完成信息认证后，才可进行相关操作。',
-            confirmText: '去认证'
-          }).then(() => {
-            this.$linkTo('../AppMine/userInfo')
-          }).catch(() => {
-          })
-
-          return false
-        }
-
-        this.commentId = ''
-        this.replyName = ''
-        this.isShowComment = true
-
-        this.$nextTick(() => {
-          setTimeout(() => {
-            this.focus = true
-          }, 500)
-        })
-      },
-      replay (item) {
-        if (!this.user.areaId) {
-          this.$dialog.confirm({
-            content: '您只有完成信息认证后，才可进行相关操作。',
-            confirmText: '去认证'
-          }).then(() => {
-            this.$linkTo('../AppMine/userInfo')
-          }).catch(() => {
-          })
-
-          return false
-        }
-
-        this.commentId = item.id
-        this.replyName = item.createUserName
-
-        this.isShowComment = true
-
-        this.$nextTick(() => {
-          setTimeout(() => {
-            this.focus = true
-          }, 500)
-        })
-      },
-      getInfo (id) {
-        this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
-          withoutToken: !this.token,
-        }).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            this.pageShow = true
-          }
-
-          uni.hideLoading()
-        })
-      },
-      reciate () {
-        this.$loading()
-        this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${this.id}`).then(res => {
-          if (res.code === 0) {
-            this.$toast(this.info.appreciateStatus ? '取消点赞' : '点赞成功')
-            uni.$emit('updateList')
-            this.getInfo(this.id)
-          }
-          uni.hideLoading()
-        })
-      },
-      send () {
-        if (!this.content) {
-          return this.$toast('内容不能为空')
-        }
-
-        this.$loading()
-        this.$instance.post(!this.commentId ? `/app/appneighborhoodassistance/addComment` : `/app/appneighborhoodassistance/addReply`, {
-          content: this.content,
-          naId: this.id,
-          type: this.commentId ? 1 : 0,
-          commentId: this.commentId || ''
-        }).then(res => {
-          uni.hideLoading()
-          if (res.code === 0) {
-            this.isShowComment = false
-            this.$toast('提交成功')
-            this.content = ''
-            this.replyName = ''
-            this.commentId = ''
-            this.focus = false
-
-            this.isMore = false
-            this.current = 1
-
-            this.$nextTick(() => {
-              this.getCommontList(this.id)
-            })
-          }
-        })
-      },
-      toTopic (url) {
-        if (this.isFrom === 'topic') {
-          uni.navigateBack({
-            delta: 1
-          })
-        } else {
-          this.$linkTo(url)
-        }
-      },
-      getCommontList (id) {
-        if (this.isMore) return
-
-        this.$loading()
-        this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
-          withoutToken: !this.token,
-          params: {
-            id,
-            current: this.current,
-            size: 10
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.$hideLoading()
-            if (this.current > 1) {
-              this.list = [...this.list, ...res.data.records]
-            } else {
-              this.list = res.data.records
-            }
-
-            if (res.data.records.length < 10) {
-              this.isMore = true
-
-              return false
-            }
-
-            this.current = this.current + 1
-          } else {
-            this.isMore = true
-          }
+    showComment() {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('../AppMine/userInfo')
         }).catch(() => {
-          this.$hideLoading()
         })
-      }
-    },
-    onReachBottom () {
-      this.getCommontList()
-    },
-    onShareTimeline () {
-      return {
-        title: this.info.content,
-        path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
-      }
-    },
 
-    onShareAppMessage () {
-      this.$instance.post(`/app/appneighborhoodassistance/share?id=${this.id}`).then(res => {
+        return false
+      }
+
+      this.commentId = ''
+      this.replyName = ''
+      this.isShowComment = true
+
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.focus = true
+        }, 500)
+      })
+    },
+    replay(item) {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('../AppMine/userInfo')
+        }).catch(() => {
+        })
+
+        return false
+      }
+
+      this.commentId = item.id
+      this.replyName = item.createUserName
+
+      this.isShowComment = true
+
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.focus = true
+        }, 500)
+      })
+    },
+    getInfo(id) {
+      return this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
+        withoutToken: !this.token,
+      }).then(res => {
+        if (res?.data) {
+          this.info = res.data
+          this.pageShow = true
+        }
+      })
+    },
+    reciate() {
+      this.$loading()
+      this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${this.id}`).then(res => {
         if (res.code === 0) {
+          this.$toast(this.info.appreciateStatus ? '取消点赞' : '点赞成功')
           uni.$emit('updateList')
           this.getInfo(this.id)
         }
+        uni.hideLoading()
       })
-      return {
-        title: this.info.content,
-        path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    },
+    send() {
+      if (!this.content) {
+        return this.$toast('内容不能为空')
+      }
+
+      this.$loading()
+      this.$instance.post(!this.commentId ? `/app/appneighborhoodassistance/addComment` : `/app/appneighborhoodassistance/addReply`, {
+        content: this.content,
+        naId: this.id,
+        type: this.commentId ? 1 : 0,
+        commentId: this.commentId || ''
+      }).then(res => {
+        uni.hideLoading()
+        if (res.code === 0) {
+          this.isShowComment = false
+          this.$toast('提交成功')
+          this.content = ''
+          this.replyName = ''
+          this.commentId = ''
+          this.focus = false
+
+          this.isMore = false
+          this.current = 1
+
+          this.$nextTick(() => {
+            this.getCommontList(this.id)
+          })
+        }
+      })
+    },
+    toTopic(url) {
+      if (this.isFrom === 'topic') {
+        uni.navigateBack({
+          delta: 1
+        })
+      } else {
+        this.$linkTo(url)
       }
     },
-  }
+    getCommontList(id) {
+      if (this.isMore) return
+      this.$loading()
+      return this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
+        withoutToken: !this.token,
+        params: {
+          id,
+          current: this.current,
+          size: 10
+        }
+      }).then(res => {
+        if (res?.data) {
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+          this.current = this.current + 1
+        } else {
+          this.isMore = true
+        }
+      }).finally(() => {
+        this.$hideLoading()
+      })
+    }
+  },
+  onReachBottom() {
+    this.getCommontList()
+  },
+  onShareTimeline() {
+    return {
+      title: this.info.content,
+      path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    }
+  },
+  onShareAppMessage() {
+    this.$instance.post(`/app/appneighborhoodassistance/share?id=${this.id}`).then(res => {
+      if (res.code === 0) {
+        uni.$emit('updateList')
+        this.getInfo(this.id)
+      }
+    })
+    return {
+      title: this.info.content,
+      path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    }
+  },
+}
 </script>
 
 <style scoped lang="scss">
-  .Detail {
-    padding-top: 24px;
-    padding-bottom: 130px;
+.Detail {
+  padding-top: 24px;
+  padding-bottom: 130px;
 
-    div {
-      box-sizing: border-box;
-    }
+  div {
+    box-sizing: border-box;
+  }
 
-    .popup {
-      height: 400px;
-      border-radius: 20px 20px 0 0;
+  .popup {
+    height: 400px;
+    border-radius: 20px 20px 0 0;
 
-      .popup-title {
-        position: relative;
-        height: 98px;
-        line-height: 98px;
-        text-align: center;
+    .popup-title {
+      position: relative;
+      height: 98px;
+      line-height: 98px;
+      text-align: center;
 
-        image {
-          position: absolute;
-          right: 40px;
-          top: 50%;
-          z-index: 1;
-          width: 32px;
-          height: 32px;
-          transform: translateY(-50%);
-        }
-
-        h2 {
-          color: #333333;
-          font-size: 34px;
-          font-weight: 600;
-        }
+      image {
+        position: absolute;
+        right: 40px;
+        top: 50%;
+        z-index: 1;
+        width: 32px;
+        height: 32px;
+        transform: translateY(-50%);
       }
 
-      .popup-list {
-        display: flex;
-        align-items: center;
-        margin-top: 30px;
-
-        button {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          flex: 1;
-          flex-direction: column;
-
-          image {
-            width: 94px;
-            height: 94px;
-            margin-bottom: 8px;
-          }
-
-          span {
-            font-size: 26px;
-            color: #1D2229;
-          }
-        }
-      }
-
-      .form {
-        padding: 0 32px;
-
-        textarea {
-          width: 100%;
-          margin-bottom: 20px;
-          height: 200px;
-          line-height: 1.3;
-          padding: 20px;
-          font-size: 28px;
-          color: #333;
-          box-sizing: border-box;
-          background: #eeeeee;
-        }
-
-        & > div {
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
-        }
-
-        .send-btn {
-          display: inline-block;
-          width: 100px;
-          height: 60px;
-          line-height: 60px;
-          text-align: center;
-          font-size: 26px;
-          color: #fff;
-          border-radius: 30px;
-          background: #2d7dffff;
-        }
+      h2 {
+        color: #333333;
+        font-size: 34px;
+        font-weight: 600;
       }
     }
-    .footer {
+
+    .popup-list {
       display: flex;
       align-items: center;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 111;
-      width: 100%;
-      padding: 18px 32px;
-      background: #fff;
+      margin-top: 30px;
 
-      span {
+      button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
         flex: 1;
-        height: 70px;
-        line-height: 70px;
-        // margin-right: 16px;
-        padding: 0 24px;
-        border-radius: 36px;
-        font-size: 26px;
+        flex-direction: column;
+
+        image {
+          width: 94px;
+          height: 94px;
+          margin-bottom: 8px;
+        }
+
+        span {
+          font-size: 26px;
+          color: #1D2229;
+        }
+      }
+    }
+
+    .form {
+      padding: 0 32px;
+
+      textarea {
+        width: 100%;
+        margin-bottom: 20px;
+        height: 200px;
+        line-height: 1.3;
+        padding: 20px;
+        font-size: 28px;
+        color: #333;
         box-sizing: border-box;
         background: #eeeeee;
-        color: #999;
       }
 
-      div {
+      & > div {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
+
+      .send-btn {
+        display: inline-block;
         width: 100px;
         height: 60px;
         line-height: 60px;
@@ -491,278 +444,318 @@
         background: #2d7dffff;
       }
     }
+  }
 
-    .comment {
-      margin-top: 24px;
-      padding: 32px 32px 26px;
-      background: #fff;
+  .footer {
+    display: flex;
+    align-items: center;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 111;
+    width: 100%;
+    padding: 18px 32px;
+    background: #fff;
 
-      .comment-wrapper {
-        .comment-item {
-          display: flex;
-          padding: 26px 0;
-
-          &:first-child {
-            padding-top: 0;
-          }
-
-          &:last-child {
-            padding-bottom: 0;
-          }
-
-          & > image {
-            width: 72px;
-            height: 72px;
-            margin-right: 16px;
-            border-radius: 50%;
-          }
-
-          .replay-list {
-            margin-top: 32px;
-
-            .replay-item {
-              display: flex;
-              margin-bottom: 32px;
-
-              &:last-child {
-                margin-bottom: 0;
-              }
-
-              image {
-                width: 48px;
-                height: 48px;
-                margin-right: 16px;
-                border-radius: 50%;
-              }
-
-              .replay-item__right {
-                flex: 1;
-
-                .top {
-                  display: flex;
-                  align-items: center;
-                  justify-content: space-between;
-                  margin-bottom: 6px;
-
-                  .replay-left {
-                    display: flex;
-                    align-items: center;
-                  }
-
-                  h3 {
-                    color: #666666;
-                    font-size: 24px;
-                  }
-
-                  span {
-                    margin: 0 8px;
-                    font-size: 24px;
-                    color: #687DA6;
-                  }
-
-                  p {
-                    color: #999999;
-                    font-size: 24px;
-                  }
-                }
-
-                & > p {
-                  line-height: 1.3;
-                  color: #333333;
-                  font-size: 24px;
-                }
-              }
-            }
-          }
-
-          & > .right {
-            flex: 1;
-            padding-bottom: 32px;
-            border-bottom: 1px solid #EEEEEE;
-
-            & > h3 {
-              line-height: 40px;
-              margin-bottom: 8px;
-              color: #666666;
-              font-size: 28px;
-            }
-
-            & > p {
-              line-height: 42px;
-              margin-bottom: 24px;
-              color: #333;
-              font-size: 28px;
-            }
-
-            .bottom {
-              display: flex;
-              align-items: center;
-              justify-content: space-between;
-
-              span {
-                color: #999999;
-                font-size: 24px;
-              }
-
-              div {
-                color: #687DA6;
-                font-size: 24px;
-              }
-            }
-          }
-
-          &:last-child {
-            padding-bottom: 0;
-
-            .right {
-              padding-bottom: 0;
-              border-bottom: none;
-            }
-          }
-        }
-      }
-
-      & > h2 {
-        margin-bottom: 32px;
-        color: #3d3d3d;
-        font-size: 38px;
-        font-weight: 600;
-      }
+    span {
+      flex: 1;
+      height: 70px;
+      line-height: 70px;
+      // margin-right: 16px;
+      padding: 0 24px;
+      border-radius: 36px;
+      font-size: 26px;
+      box-sizing: border-box;
+      background: #eeeeee;
+      color: #999;
     }
 
-    & > .top {
-      padding: 32px 32px 0;
-      background: #ffffff;
-      position: relative;
+    div {
+      width: 100px;
+      height: 60px;
+      line-height: 60px;
+      text-align: center;
+      font-size: 26px;
+      color: #fff;
+      border-radius: 30px;
+      background: #2d7dffff;
+    }
+  }
 
-      .item-top {
+  .comment {
+    margin-top: 24px;
+    padding: 32px 32px 26px;
+    background: #fff;
+
+    .comment-wrapper {
+      .comment-item {
         display: flex;
-        align-items: center;
+        padding: 26px 0;
 
-        image {
-          width: 96px;
-          height: 96px;
+        &:first-child {
+          padding-top: 0;
+        }
+
+        &:last-child {
+          padding-bottom: 0;
+        }
+
+        & > image {
+          width: 72px;
+          height: 72px;
           margin-right: 16px;
           border-radius: 50%;
         }
 
-        h3 {
-          color: #333333;
-          text-align: left;
-          font-size: 34px;
-          font-weight: 500;
+        .replay-list {
+          margin-top: 32px;
+
+          .replay-item {
+            display: flex;
+            margin-bottom: 32px;
+
+            &:last-child {
+              margin-bottom: 0;
+            }
+
+            image {
+              width: 48px;
+              height: 48px;
+              margin-right: 16px;
+              border-radius: 50%;
+            }
+
+            .replay-item__right {
+              flex: 1;
+
+              .top {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                margin-bottom: 6px;
+
+                .replay-left {
+                  display: flex;
+                  align-items: center;
+                }
+
+                h3 {
+                  color: #666666;
+                  font-size: 24px;
+                }
+
+                span {
+                  margin: 0 8px;
+                  font-size: 24px;
+                  color: #687DA6;
+                }
+
+                p {
+                  color: #999999;
+                  font-size: 24px;
+                }
+              }
+
+              & > p {
+                line-height: 1.3;
+                color: #333333;
+                font-size: 24px;
+              }
+            }
+          }
         }
 
-        span {
-          margin-top: 12px;
-          color: #999999;
-          font-size: 28px;
+        & > .right {
+          flex: 1;
+          padding-bottom: 32px;
+          border-bottom: 1px solid #EEEEEE;
+
+          & > h3 {
+            line-height: 40px;
+            margin-bottom: 8px;
+            color: #666666;
+            font-size: 28px;
+          }
+
+          & > p {
+            line-height: 42px;
+            margin-bottom: 24px;
+            color: #333;
+            font-size: 28px;
+          }
+
+          .bottom {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            span {
+              color: #999999;
+              font-size: 24px;
+            }
+
+            div {
+              color: #687DA6;
+              font-size: 24px;
+            }
+          }
         }
-      }
 
+        &:last-child {
+          padding-bottom: 0;
 
-      .item-imgs {
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-
-        image {
-          height: 208px;
-          width: 33.33%;
-          padding-right: 12px;
-          margin-bottom: 12px;
-          box-sizing: border-box;
-
-          &:nth-of-type(3n) {
-            padding-right: 0;
+          .right {
+            padding-bottom: 0;
+            border-bottom: none;
           }
         }
       }
+    }
 
-      & > p {
-        margin: 12px 0;
+    & > h2 {
+      margin-bottom: 32px;
+      color: #3d3d3d;
+      font-size: 38px;
+      font-weight: 600;
+    }
+  }
+
+  & > .top {
+    padding: 32px 32px 0;
+    background: #ffffff;
+    position: relative;
+
+    .item-top {
+      display: flex;
+      align-items: center;
+
+      image {
+        width: 96px;
+        height: 96px;
+        margin-right: 16px;
+        border-radius: 50%;
+      }
+
+      h3 {
+        color: #333333;
+        text-align: left;
+        font-size: 34px;
+        font-weight: 500;
+      }
+
+      span {
+        margin-top: 12px;
+        color: #999999;
+        font-size: 28px;
+      }
+    }
+
+
+    .item-imgs {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      image {
+        height: 208px;
+        width: 33.33%;
+        padding-right: 12px;
+        margin-bottom: 12px;
+        box-sizing: border-box;
+
+        &:nth-of-type(3n) {
+          padding-right: 0;
+        }
+      }
+    }
+
+    & > p {
+      margin: 12px 0;
+      font-size: 28px;
+      color: #333333;
+    }
+
+    .item-bottom {
+      display: flex;
+      align-items: center;
+      height: 88px;
+      border-top: 1px solid #eeeeee;
+
+      div, button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex: 1;
+
+        image {
+          width: 40px;
+          height: 40px;
+          margin: 16px;
+        }
+
+        i {
+          color: #687DA6;
+          font-size: 28px;
+        }
+      }
+    }
+
+    .item-content {
+      margin: 16px 0;
+      line-height: 1.3;
+      text-align: justify;
+
+      span {
+        font-size: 28px;
+        color: #4181FF;
+      }
+
+      text {
         font-size: 28px;
         color: #333333;
       }
+    }
 
-      .item-bottom {
-        display: flex;
-        align-items: center;
-        height: 88px;
-        border-top: 1px solid #eeeeee;
+    .info-flex {
+      display: flex;
+      color: #666;
+      font-size: 24px;
+      font-family: "PingFang SC";
+      line-height: 30px;
+      margin-bottom: 16px;
 
-        div, button {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          flex: 1;
+      .label {
+        width: 160px;
 
-          image {
-            width: 40px;
-            height: 40px;
-            margin: 16px;
-          }
-
-          i {
-            color: #687DA6;
-            font-size: 28px;
-          }
+        img {
+          width: 30px;
+          height: 30px;
+          margin-right: 8px;
+          vertical-align: bottom;
         }
       }
 
-      .item-content {
-        margin: 16px 0;
-        line-height: 1.3;
-        text-align: justify;
-
-        span {
-          font-size: 28px;
-          color: #4181FF;
-        }
-
-        text {
-          font-size: 28px;
-          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;
+      .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/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue
index 0942ff7..4193a92 100644
--- a/src/project/fengdu/AppCircle/Detail.vue
+++ b/src/project/fengdu/AppCircle/Detail.vue
@@ -2,7 +2,7 @@
   <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'" />
+        <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>
@@ -24,7 +24,7 @@
           <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="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">
@@ -34,12 +34,12 @@
 
       </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" />
+        <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" />
+          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-zhuanfa.png"/>
           <i>{{ info.sharedCount }}</i>
         </button>
         <div>
@@ -47,7 +47,7 @@
           <i>{{ info.appreciateCount }}</i>
         </div>
         <div>
-          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png" />
+          <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-pinglun.png"/>
           <i>{{ info.commentCount }}</i>
         </div>
       </div>
@@ -56,7 +56,7 @@
       <h2>评论</h2>
       <div class="comment-wrapper">
         <div class="comment-item" v-for="(item, index) in list" :key="index">
-          <image :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
+          <image :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
           <div class="right">
             <h3>{{ item.createUserName }}</h3>
             <p>{{ item.content }}</p>
@@ -66,7 +66,7 @@
             </div>
             <div class="replay-list" v-if="item.replyList.length">
               <div class="replay-item" v-for="replay in item.replyList" :key="replay.id">
-                <image :src="replay.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
+                <image :src="replay.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'"/>
                 <div class="replay-item__right">
                   <div class="top">
                     <div class="replay-left">
@@ -90,14 +90,14 @@
       <!-- <div hover-class="hover-class">发送</div> -->
     </div>
     <u-popup v-model="isShow" mode="bottom" hidden height="350rpx" border-radius="30">
-			<div class="popup">
+      <div class="popup">
         <div class="popup-title">
           <h2>请选择</h2>
-          <image @click="isShow = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png" />
+          <image @click="isShow = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png"/>
         </div>
         <div class="popup-list">
           <button open-type="share">
-            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-wechat.png" />
+            <image src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-wechat.png"/>
             <span>微信</span>
           </button>
           <!-- <button open-type="share">
@@ -110,12 +110,12 @@
           </button> -->
         </div>
       </div>
-		</u-popup>
+    </u-popup>
     <u-popup v-model="isShowComment" mode="bottom" hidden height="400rpx" border-radius="30" @close="focus = false">
-			<div class="popup">
+      <div class="popup">
         <div class="popup-title">
           <h2>评论</h2>
-          <image @click="isShowComment = false, focus = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png" />
+          <image @click="isShowComment = false, focus = false" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-guanbi.png"/>
         </div>
         <div class="form">
           <textarea :maxlength="100" :cursor-spacing="10" :placeholder="commentId ? '回复' + replyName : '请输入评论内容'" :focus="focus" v-model="content"></textarea>
@@ -124,378 +124,313 @@
           </div>
         </div>
       </div>
-		</u-popup>
+    </u-popup>
   </div>
 </template>
 
 <script>
-  import { mapActions, mapState } from 'vuex'
-  export default {
-    name: 'Detail',
-    appName: '详情',
+import {mapActions, mapState} from 'vuex'
 
-    data () {
-      return {
-        id: '',
-        isShow: false,
-        info: {},
-        name: '',
-        themeId: '',
-        isFrom: '',
-        list: [],
-        isMore: false,
-        isShowComment: false,
-        current: 1,
-        content: '',
-        focus: false,
-        pageShow: false,
-        commentId: '',
-        replyName: ''
+export default {
+  name: 'Detail',
+  appName: '详情',
+  data() {
+    return {
+      id: '',
+      isShow: false,
+      info: {},
+      name: '',
+      themeId: '',
+      isFrom: '',
+      list: [],
+      isMore: false,
+      isShowComment: false,
+      current: 1,
+      content: '',
+      focus: false,
+      pageShow: false,
+      commentId: '',
+      replyName: ''
+    }
+  },
+  computed: {
+    ...mapState(['user', 'token'])
+  },
+  onLoad(query) {
+    this.isFrom = query.isFrom
+    this.id = query.id
+    this.themeId = query.themeId
+    this.name = query.name || ''
+
+    this.$loading();
+    (this.token ? Promise.resolve() : this.autoLogin()).finally(() => Promise.all([
+      this.getInfo(query.id),
+      this.getCommontList(query.id)
+    ])).finally(() => this.$hideLoading())
+  },
+  methods: {
+    ...mapActions(['autoLogin']),
+    toTask() {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('../AppMine/userInfo')
+        })
+        return false
       }
+      this.$linkTo(`/mods/AppNewFarmerBank/taskDetail?id=${this.info.integralTaskId}`)
     },
-
-    computed: {
-      ...mapState(['user', 'token'])
+    previewImage(url, files) {
+      uni.previewImage({
+        current: url,
+        urls: files.map(v => v.url)
+      })
     },
-
-    onLoad (query) {
-      this.isFrom = query.isFrom
-      this.id = query.id
-      this.themeId = query.themeId
-      this.name = query.name || ''
-
-      this.$loading()
-      if (!this.token) {
-        this.autoLogin().then(() => {
-          this.getInfo(query.id)
-          this.getCommontList(query.id)
-        })
-      } else {
-        this.getInfo(query.id)
-        this.getCommontList(query.id)
-      }
-    },
-
-    methods: {
-      ...mapActions(['autoLogin']),
-
-      toTask() {
-        if (!this.user.areaId) {
-          this.$dialog.confirm({
-            content: '您只有完成信息认证后，才可进行相关操作。',
-            confirmText: '去认证'
-          }).then(() => {
-            this.$linkTo('../AppMine/userInfo')
-          })
-          return false
-        }
-        this.$linkTo(`/mods/AppNewFarmerBank/taskDetail?id=${this.info.integralTaskId}`)
-      },
-
-      previewImage (url, files) {
-        uni.previewImage({
-          current: url,
-          urls: files.map(v => v.url)
-        })
-      },
-
-      showComment () {
-        if (!this.user.areaId) {
-          this.$dialog.confirm({
-            content: '您只有完成信息认证后，才可进行相关操作。',
-            confirmText: '去认证'
-          }).then(() => {
-            this.$linkTo('../AppMine/userInfo')
-          }).catch(() => {
-          })
-
-          return false
-        }
-
-        this.commentId = ''
-        this.replyName = ''
-        this.isShowComment = true
-
-        this.$nextTick(() => {
-          setTimeout(() => {
-            this.focus = true
-          }, 500)
-        })
-      },
-
-      replay (item) {
-        if (!this.user.areaId) {
-          this.$dialog.confirm({
-            content: '您只有完成信息认证后，才可进行相关操作。',
-            confirmText: '去认证'
-          }).then(() => {
-            this.$linkTo('../AppMine/userInfo')
-          }).catch(() => {
-          })
-
-          return false
-        }
-
-        this.commentId = item.id
-        this.replyName = item.createUserName
-
-        this.isShowComment = true
-
-        this.$nextTick(() => {
-          setTimeout(() => {
-            this.focus = true
-          }, 500)
-        })
-      },
-
-      getInfo (id) {
-        this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
-          withoutToken: !this.token,
-        }).then(res => {
-          if (res.code === 0) {
-            this.info = res.data
-            this.pageShow = true
-          }
-
-          uni.hideLoading()
-        })
-      },
-
-      reciate () {
-        this.$loading()
-        this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${this.id}`).then(res => {
-          if (res.code === 0) {
-            this.$toast(this.info.appreciateStatus ? '取消点赞' : '点赞成功')
-            uni.$emit('updateList')
-            this.getInfo(this.id)
-          }
-          uni.hideLoading()
-        })
-      },
-
-      send () {
-        if (!this.content) {
-          return this.$toast('内容不能为空')
-        }
-
-        this.$loading()
-        this.$instance.post(!this.commentId ? `/app/appneighborhoodassistance/addComment` : `/app/appneighborhoodassistance/addReply`, {
-          content: this.content,
-          naId: this.id,
-          type: this.commentId ? 1 : 0,
-          commentId: this.commentId || ''
-        }).then(res => {
-          uni.hideLoading()
-          if (res.code === 0) {
-            this.isShowComment = false
-            this.$toast('提交成功')
-            this.content = ''
-            this.replyName = ''
-            this.commentId = ''
-            this.focus = false
-
-            this.isMore = false
-            this.current = 1
-
-            this.$nextTick(() => {
-              this.getCommontList(this.id)
-            })
-          }
-        })
-      },
-
-      toTopic (url) {
-        if (this.isFrom === 'topic') {
-          uni.navigateBack({
-            delta: 1
-          })
-        } else {
-          this.$linkTo(url)
-        }
-      },
-
-      getCommontList (id) {
-        if (this.isMore) return
-
-        this.$loading()
-        this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
-          withoutToken: !this.token,
-          params: {
-            id,
-            current: this.current,
-            size: 10
-          }
-        }).then(res => {
-          if (res.code === 0) {
-            this.$hideLoading()
-            if (this.current > 1) {
-              this.list = [...this.list, ...res.data.records]
-            } else {
-              this.list = res.data.records
-            }
-
-            if (res.data.records.length < 10) {
-              this.isMore = true
-
-              return false
-            }
-
-            this.current = this.current + 1
-          } else {
-            this.isMore = true
-          }
+    showComment() {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('../AppMine/userInfo')
         }).catch(() => {
-          this.$hideLoading()
         })
+
+        return false
       }
-    },
 
-    onReachBottom () {
-      this.getCommontList()
-    },
+      this.commentId = ''
+      this.replyName = ''
+      this.isShowComment = true
 
-    onShareTimeline () {
-      return {
-        title: this.info.content,
-        path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.focus = true
+        }, 500)
+      })
+    },
+    replay(item) {
+      if (!this.user.areaId) {
+        this.$dialog.confirm({
+          content: '您只有完成信息认证后，才可进行相关操作。',
+          confirmText: '去认证'
+        }).then(() => {
+          this.$linkTo('../AppMine/userInfo')
+        }).catch(() => {
+        })
+
+        return false
       }
-    },
 
-    onShareAppMessage () {
-      this.$instance.post(`/app/appneighborhoodassistance/share?id=${this.id}`).then(res => {
+      this.commentId = item.id
+      this.replyName = item.createUserName
+
+      this.isShowComment = true
+
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.focus = true
+        }, 500)
+      })
+    },
+    getInfo(id) {
+      return this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
+        withoutToken: !this.token,
+      }).then(res => {
+        if (res?.data) {
+          this.info = res.data
+          return this.pageShow = true
+        }
+      })
+    },
+    reciate() {
+      this.$loading()
+      this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${this.id}`).then(res => {
         if (res.code === 0) {
+          this.$toast(this.info.appreciateStatus ? '取消点赞' : '点赞成功')
           uni.$emit('updateList')
           this.getInfo(this.id)
         }
+        uni.hideLoading()
       })
-      return {
-        title: this.info.content,
-        path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    },
+    send() {
+      if (!this.content) {
+        return this.$toast('内容不能为空')
+      }
+      this.$loading()
+      this.$instance.post(!this.commentId ? `/app/appneighborhoodassistance/addComment` : `/app/appneighborhoodassistance/addReply`, {
+        content: this.content,
+        naId: this.id,
+        type: this.commentId ? 1 : 0,
+        commentId: this.commentId || ''
+      }).then(res => {
+        if (res.code === 0) {
+          this.isShowComment = false
+          this.$toast('提交成功')
+          this.content = ''
+          this.replyName = ''
+          this.commentId = ''
+          this.focus = false
+
+          this.isMore = false
+          this.current = 1
+          this.$nextTick(() => {
+            this.getCommontList(this.id)
+          })
+        }
+      })
+    },
+    toTopic(url) {
+      if (this.isFrom === 'topic') {
+        uni.navigateBack({
+          delta: 1
+        })
+      } else {
+        this.$linkTo(url)
       }
     },
-  }
+    getCommontList(id) {
+      if (this.isMore) return
+      this.$loading()
+      return this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
+        withoutToken: !this.token,
+        params: {
+          id,
+          current: this.current,
+          size: 10
+        }
+      }).then(res => {
+        if (res?.data) {
+          if (this.current > 1) {
+            this.list = [...this.list, ...res.data.records]
+          } else {
+            this.list = res.data.records
+          }
+
+          if (res.data.records.length < 10) {
+            this.isMore = true
+
+            return false
+          }
+
+          this.current = this.current + 1
+        } else {
+          this.isMore = true
+        }
+      }).finally(() => this.$hideLoading())
+    }
+  },
+  onReachBottom() {
+    this.getCommontList()
+  },
+  onShareTimeline() {
+    return {
+      title: this.info.content,
+      path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    }
+  },
+  onShareAppMessage() {
+    this.$instance.post(`/app/appneighborhoodassistance/share?id=${this.id}`).then(res => {
+      if (res.code === 0) {
+        uni.$emit('updateList')
+        this.getInfo(this.id)
+      }
+    })
+    return {
+      title: this.info.content,
+      path: `/pages/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    }
+  },
+}
 </script>
 
 <style scoped lang="scss">
-  .Detail {
-    padding-top: 24px;
-    padding-bottom: 130px;
+.Detail {
+  padding-top: 24px;
+  padding-bottom: 130px;
 
-    div {
-      box-sizing: border-box;
-    }
+  div {
+    box-sizing: border-box;
+  }
 
-    .popup {
-      height: 400px;
-      border-radius: 20px 20px 0 0;
+  .popup {
+    height: 400px;
+    border-radius: 20px 20px 0 0;
 
-      .popup-title {
-        position: relative;
-        height: 98px;
-        line-height: 98px;
-        text-align: center;
+    .popup-title {
+      position: relative;
+      height: 98px;
+      line-height: 98px;
+      text-align: center;
 
-        image {
-          position: absolute;
-          right: 40px;
-          top: 50%;
-          z-index: 1;
-          width: 32px;
-          height: 32px;
-          transform: translateY(-50%);
-        }
-
-        h2 {
-          color: #333333;
-          font-size: 34px;
-          font-weight: 600;
-        }
+      image {
+        position: absolute;
+        right: 40px;
+        top: 50%;
+        z-index: 1;
+        width: 32px;
+        height: 32px;
+        transform: translateY(-50%);
       }
 
-      .popup-list {
-        display: flex;
-        align-items: center;
-        margin-top: 30px;
-
-        button {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          flex: 1;
-          flex-direction: column;
-
-          image {
-            width: 94px;
-            height: 94px;
-            margin-bottom: 8px;
-          }
-
-          span {
-            font-size: 26px;
-            color: #1D2229;
-          }
-        }
-      }
-
-      .form {
-        padding: 0 32px;
-
-        textarea {
-          width: 100%;
-          margin-bottom: 20px;
-          height: 200px;
-          line-height: 1.3;
-          padding: 20px;
-          font-size: 28px;
-          color: #333;
-          box-sizing: border-box;
-          background: #eeeeee;
-        }
-
-        & > div {
-          display: flex;
-          align-items: center;
-          justify-content: flex-end;
-        }
-
-        .send-btn {
-          display: inline-block;
-          width: 100px;
-          height: 60px;
-          line-height: 60px;
-          text-align: center;
-          font-size: 26px;
-          color: #fff;
-          border-radius: 30px;
-          background: #2d7dffff;
-        }
+      h2 {
+        color: #333333;
+        font-size: 34px;
+        font-weight: 600;
       }
     }
-    .footer {
+
+    .popup-list {
       display: flex;
       align-items: center;
-      position: fixed;
-      left: 0;
-      bottom: 0;
-      z-index: 111;
-      width: 100%;
-      padding: 18px 32px;
-      background: #fff;
+      margin-top: 30px;
 
-      span {
+      button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
         flex: 1;
-        height: 70px;
-        line-height: 70px;
-        // margin-right: 16px;
-        padding: 0 24px;
-        border-radius: 36px;
-        font-size: 26px;
+        flex-direction: column;
+
+        image {
+          width: 94px;
+          height: 94px;
+          margin-bottom: 8px;
+        }
+
+        span {
+          font-size: 26px;
+          color: #1D2229;
+        }
+      }
+    }
+
+    .form {
+      padding: 0 32px;
+
+      textarea {
+        width: 100%;
+        margin-bottom: 20px;
+        height: 200px;
+        line-height: 1.3;
+        padding: 20px;
+        font-size: 28px;
+        color: #333;
         box-sizing: border-box;
         background: #eeeeee;
-        color: #999;
       }
 
-      div {
+      & > div {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+      }
+
+      .send-btn {
+        display: inline-block;
         width: 100px;
         height: 60px;
         line-height: 60px;
@@ -506,278 +441,318 @@
         background: #2d7dffff;
       }
     }
+  }
 
-    .comment {
-      margin-top: 24px;
-      padding: 32px 32px 26px;
-      background: #fff;
+  .footer {
+    display: flex;
+    align-items: center;
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    z-index: 111;
+    width: 100%;
+    padding: 18px 32px;
+    background: #fff;
 
-      .comment-wrapper {
-        .comment-item {
-          display: flex;
-          padding: 26px 0;
-
-          &:first-child {
-            padding-top: 0;
-          }
-
-          &:last-child {
-            padding-bottom: 0;
-          }
-
-          & > image {
-            width: 72px;
-            height: 72px;
-            margin-right: 16px;
-            border-radius: 50%;
-          }
-
-          .replay-list {
-            margin-top: 32px;
-
-            .replay-item {
-              display: flex;
-              margin-bottom: 32px;
-
-              &:last-child {
-                margin-bottom: 0;
-              }
-
-              image {
-                width: 48px;
-                height: 48px;
-                margin-right: 16px;
-                border-radius: 50%;
-              }
-
-              .replay-item__right {
-                flex: 1;
-
-                .top {
-                  display: flex;
-                  align-items: center;
-                  justify-content: space-between;
-                  margin-bottom: 6px;
-
-                  .replay-left {
-                    display: flex;
-                    align-items: center;
-                  }
-
-                  h3 {
-                    color: #666666;
-                    font-size: 24px;
-                  }
-
-                  span {
-                    margin: 0 8px;
-                    font-size: 24px;
-                    color: #687DA6;
-                  }
-
-                  p {
-                    color: #999999;
-                    font-size: 24px;
-                  }
-                }
-
-                & > p {
-                  line-height: 1.3;
-                  color: #333333;
-                  font-size: 24px;
-                }
-              }
-            }
-          }
-
-          & > .right {
-            flex: 1;
-            padding-bottom: 32px;
-            border-bottom: 1px solid #EEEEEE;
-
-            & > h3 {
-              line-height: 40px;
-              margin-bottom: 8px;
-              color: #666666;
-              font-size: 28px;
-            }
-
-            & > p {
-              line-height: 42px;
-              margin-bottom: 24px;
-              color: #333;
-              font-size: 28px;
-            }
-
-            .bottom {
-              display: flex;
-              align-items: center;
-              justify-content: space-between;
-
-              span {
-                color: #999999;
-                font-size: 24px;
-              }
-
-              div {
-                color: #687DA6;
-                font-size: 24px;
-              }
-            }
-          }
-
-          &:last-child {
-            padding-bottom: 0;
-
-            .right {
-              padding-bottom: 0;
-              border-bottom: none;
-            }
-          }
-        }
-      }
-
-      & > h2 {
-        margin-bottom: 32px;
-        color: #3d3d3d;
-        font-size: 38px;
-        font-weight: 600;
-      }
+    span {
+      flex: 1;
+      height: 70px;
+      line-height: 70px;
+      // margin-right: 16px;
+      padding: 0 24px;
+      border-radius: 36px;
+      font-size: 26px;
+      box-sizing: border-box;
+      background: #eeeeee;
+      color: #999;
     }
 
-    & > .top {
-      padding: 32px 32px 0;
-      background: #ffffff;
-      position: relative;
+    div {
+      width: 100px;
+      height: 60px;
+      line-height: 60px;
+      text-align: center;
+      font-size: 26px;
+      color: #fff;
+      border-radius: 30px;
+      background: #2d7dffff;
+    }
+  }
 
-      .item-top {
+  .comment {
+    margin-top: 24px;
+    padding: 32px 32px 26px;
+    background: #fff;
+
+    .comment-wrapper {
+      .comment-item {
         display: flex;
-        align-items: center;
+        padding: 26px 0;
 
-        image {
-          width: 96px;
-          height: 96px;
+        &:first-child {
+          padding-top: 0;
+        }
+
+        &:last-child {
+          padding-bottom: 0;
+        }
+
+        & > image {
+          width: 72px;
+          height: 72px;
           margin-right: 16px;
           border-radius: 50%;
         }
 
-        h3 {
-          color: #333333;
-          text-align: left;
-          font-size: 34px;
-          font-weight: 500;
+        .replay-list {
+          margin-top: 32px;
+
+          .replay-item {
+            display: flex;
+            margin-bottom: 32px;
+
+            &:last-child {
+              margin-bottom: 0;
+            }
+
+            image {
+              width: 48px;
+              height: 48px;
+              margin-right: 16px;
+              border-radius: 50%;
+            }
+
+            .replay-item__right {
+              flex: 1;
+
+              .top {
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+                margin-bottom: 6px;
+
+                .replay-left {
+                  display: flex;
+                  align-items: center;
+                }
+
+                h3 {
+                  color: #666666;
+                  font-size: 24px;
+                }
+
+                span {
+                  margin: 0 8px;
+                  font-size: 24px;
+                  color: #687DA6;
+                }
+
+                p {
+                  color: #999999;
+                  font-size: 24px;
+                }
+              }
+
+              & > p {
+                line-height: 1.3;
+                color: #333333;
+                font-size: 24px;
+              }
+            }
+          }
         }
 
-        span {
-          margin-top: 12px;
-          color: #999999;
-          font-size: 28px;
+        & > .right {
+          flex: 1;
+          padding-bottom: 32px;
+          border-bottom: 1px solid #EEEEEE;
+
+          & > h3 {
+            line-height: 40px;
+            margin-bottom: 8px;
+            color: #666666;
+            font-size: 28px;
+          }
+
+          & > p {
+            line-height: 42px;
+            margin-bottom: 24px;
+            color: #333;
+            font-size: 28px;
+          }
+
+          .bottom {
+            display: flex;
+            align-items: center;
+            justify-content: space-between;
+
+            span {
+              color: #999999;
+              font-size: 24px;
+            }
+
+            div {
+              color: #687DA6;
+              font-size: 24px;
+            }
+          }
         }
-      }
 
+        &:last-child {
+          padding-bottom: 0;
 
-      .item-imgs {
-        display: flex;
-        align-items: center;
-        flex-wrap: wrap;
-
-        image {
-          height: 208px;
-          width: 33.33%;
-          padding-right: 12px;
-          margin-bottom: 12px;
-          box-sizing: border-box;
-
-          &:nth-of-type(3n) {
-            padding-right: 0;
+          .right {
+            padding-bottom: 0;
+            border-bottom: none;
           }
         }
       }
+    }
 
-      & > p {
-        margin: 12px 0;
+    & > h2 {
+      margin-bottom: 32px;
+      color: #3d3d3d;
+      font-size: 38px;
+      font-weight: 600;
+    }
+  }
+
+  & > .top {
+    padding: 32px 32px 0;
+    background: #ffffff;
+    position: relative;
+
+    .item-top {
+      display: flex;
+      align-items: center;
+
+      image {
+        width: 96px;
+        height: 96px;
+        margin-right: 16px;
+        border-radius: 50%;
+      }
+
+      h3 {
+        color: #333333;
+        text-align: left;
+        font-size: 34px;
+        font-weight: 500;
+      }
+
+      span {
+        margin-top: 12px;
+        color: #999999;
+        font-size: 28px;
+      }
+    }
+
+
+    .item-imgs {
+      display: flex;
+      align-items: center;
+      flex-wrap: wrap;
+
+      image {
+        height: 208px;
+        width: 33.33%;
+        padding-right: 12px;
+        margin-bottom: 12px;
+        box-sizing: border-box;
+
+        &:nth-of-type(3n) {
+          padding-right: 0;
+        }
+      }
+    }
+
+    & > p {
+      margin: 12px 0;
+      font-size: 28px;
+      color: #333333;
+    }
+
+    .item-bottom {
+      display: flex;
+      align-items: center;
+      height: 88px;
+      border-top: 1px solid #eeeeee;
+
+      div, button {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        flex: 1;
+
+        image {
+          width: 40px;
+          height: 40px;
+          margin: 16px;
+        }
+
+        i {
+          color: #687DA6;
+          font-size: 28px;
+        }
+      }
+    }
+
+    .item-content {
+      margin: 16px 0;
+      line-height: 1.3;
+      text-align: justify;
+
+      span {
+        font-size: 28px;
+        color: #4181FF;
+      }
+
+      text {
         font-size: 28px;
         color: #333333;
       }
+    }
 
-      .item-bottom {
-        display: flex;
-        align-items: center;
-        height: 88px;
-        border-top: 1px solid #eeeeee;
+    .info-flex {
+      display: flex;
+      color: #666;
+      font-size: 24px;
+      font-family: "PingFang SC";
+      line-height: 30px;
+      margin-bottom: 16px;
 
-        div, button {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          flex: 1;
+      .label {
+        width: 160px;
 
-          image {
-            width: 40px;
-            height: 40px;
-            margin: 16px;
-          }
-
-          i {
-            color: #687DA6;
-            font-size: 28px;
-          }
+        img {
+          width: 30px;
+          height: 30px;
+          margin-right: 8px;
+          vertical-align: bottom;
         }
       }
 
-      .item-content {
-        margin: 16px 0;
-        line-height: 1.3;
-        text-align: justify;
-
-        span {
-          font-size: 28px;
-          color: #4181FF;
-        }
-
-        text {
-          font-size: 28px;
-          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;
+      .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/wuxi/AppCircle/Detail.vue b/src/project/wuxi/AppCircle/Detail.vue
index 74f8aa4..dd72b14 100644
--- a/src/project/wuxi/AppCircle/Detail.vue
+++ b/src/project/wuxi/AppCircle/Detail.vue
@@ -173,13 +173,11 @@ export default {
     this.id = query.id
     this.themeId = query.themeId
     this.name = query.name || ''
-    this.$loading()
-    Promise.resolve(this.token || this.autoLogin()).then(() =>
-        Promise.all([
-          this.getInfo(query.id),
-          this.getCommontList(query.id)
-        ])
-    ).finally(() => this.$hideLoading())
+    this.$loading();
+    (this.token ? Promise.resolve() : this.autoLogin()).finally(() => Promise.all([
+      this.getInfo(query.id),
+      this.getCommontList(query.id)
+    ])).finally(() => this.$hideLoading())
   },
   methods: {
     ...mapActions(['autoLogin']),
@@ -254,18 +252,15 @@ export default {
     },
 
     getInfo(id) {
-      this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
+      return this.$instance.post(`/app/appneighborhoodassistance/queryDetailById?id=${id}`, null, {
         withoutToken: !this.token,
       }).then(res => {
-        if (res.code === 0) {
+        if (res?.data) {
           this.info = res.data
-          this.pageShow = true
+          return this.pageShow = true
         }
-
-        uni.hideLoading()
       })
     },
-
     reciate() {
       this.$loading()
       this.$instance.post(`/app/appneighborhoodassistance/appreciate?id=${this.id}`).then(res => {
@@ -323,7 +318,7 @@ export default {
       if (this.isMore) return
 
       this.$loading()
-      this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
+      return this.$instance.post(`/app/appneighborhoodassistance/commontList`, null, {
         withoutToken: !this.token,
         params: {
           id,
@@ -331,7 +326,7 @@ export default {
           size: 10
         }
       }).then(res => {
-        if (res.code === 0) {
+        if (res?.data) {
           this.$hideLoading()
           if (this.current > 1) {
             this.list = [...this.list, ...res.data.records]
@@ -347,7 +342,7 @@ export default {
         } else {
           this.isMore = true
         }
-      }).catch(() => {
+      }).finally(() => {
         this.$hideLoading()
       })
     }
@@ -357,12 +352,12 @@ export default {
     this.getCommontList()
   },
 
-  // onShareTimeline() {
-  //   return {
-  //     title: this.info.content,
-  //     // path: `/mods/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
-  //   }
-  // },
+  onShareTimeline() {
+    return {
+      title: this.info.content,
+      path: `/mods/AppCircle/Detail?id=${this.id}&themeId=${this.themeId}&name=${this.name}`
+    }
+  },
   onShareAppMessage() {
     this.$instance.post(`/app/appneighborhoodassistance/share?id=${this.id}`).then(res => {
       if (res.code === 0) {

From a00aa556171504f847237444fb4da501037833cc Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 6 Mar 2024 15:50:18 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8B=E5=8F=8B?=
 =?UTF-8?q?=E5=9C=88=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/wuxi/AppCircle/Detail.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/project/wuxi/AppCircle/Detail.vue b/src/project/wuxi/AppCircle/Detail.vue
index dd72b14..16b796c 100644
--- a/src/project/wuxi/AppCircle/Detail.vue
+++ b/src/project/wuxi/AppCircle/Detail.vue
@@ -351,7 +351,6 @@ export default {
   onReachBottom() {
     this.getCommontList()
   },
-
   onShareTimeline() {
     return {
       title: this.info.content,
@@ -461,7 +460,6 @@ export default {
         width: 100px;
         height: 60px;
         line-height: 60px;
-        text-align: right;
         text-align: center;
         font-size: 26px;
         color: #fff;

From 301863e05c27497a4d9b19a01f4005262d0615ed Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 6 Mar 2024 15:51:38 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=8B=E5=8F=8B?=
 =?UTF-8?q?=E5=9C=88=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mods/extra/AppCircle/Detail.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/mods/extra/AppCircle/Detail.vue b/src/mods/extra/AppCircle/Detail.vue
index 812038c..b0e2642 100644
--- a/src/mods/extra/AppCircle/Detail.vue
+++ b/src/mods/extra/AppCircle/Detail.vue
@@ -241,7 +241,7 @@ export default {
       }).then(res => {
         if (res?.data) {
           this.info = res.data
-          this.pageShow = true
+          return this.pageShow = true
         }
       })
     },
@@ -260,7 +260,6 @@ export default {
       if (!this.content) {
         return this.$toast('内容不能为空')
       }
-
       this.$loading()
       this.$instance.post(!this.commentId ? `/app/appneighborhoodassistance/addComment` : `/app/appneighborhoodassistance/addReply`, {
         content: this.content,
@@ -268,7 +267,6 @@ export default {
         type: this.commentId ? 1 : 0,
         commentId: this.commentId || ''
       }).then(res => {
-        uni.hideLoading()
         if (res.code === 0) {
           this.isShowComment = false
           this.$toast('提交成功')
@@ -279,7 +277,6 @@ export default {
 
           this.isMore = false
           this.current = 1
-
           this.$nextTick(() => {
             this.getCommontList(this.id)
           })
@@ -321,9 +318,7 @@ export default {
         } else {
           this.isMore = true
         }
-      }).finally(() => {
-        this.$hideLoading()
-      })
+      }).finally(() => this.$hideLoading())
     }
   },
   onReachBottom() {