From 6c7b5d45dae79aa8160859e59dbc5993b03f6f45 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Mon, 20 Mar 2023 17:22:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/fengdu/AppCircle/AppCircle.vue  | 13 ++++---
 src/project/fengdu/AppCircle/Detail.vue     | 11 ++++++
 src/project/fengdu/AppCircle/MyPostList.vue | 39 +++++++++++++++++----
 3 files changed, 52 insertions(+), 11 deletions(-)

diff --git a/src/project/fengdu/AppCircle/AppCircle.vue b/src/project/fengdu/AppCircle/AppCircle.vue
index d3d88b4..c3259d3 100644
--- a/src/project/fengdu/AppCircle/AppCircle.vue
+++ b/src/project/fengdu/AppCircle/AppCircle.vue
@@ -96,9 +96,6 @@
       }
     },
 
-    onReady () {
-    },
-
     onLoad () {
       this.getTopicList()
 
@@ -159,8 +156,16 @@
       },
 
       toAdd () {
-        if (!this.user.AreaId) {
+        if (this.user.AreaId) {
           this.$linkTo('./Add')
+        } else {
+          this.$dialog.confirm({
+            content: '您只有完成信息认证后，才可进行相关操作。',
+            confirmText: '去认证'
+          }).then(() => {
+            this.$linkTo('../AppMine/userInfo')
+          }).catch(() => {
+          })
         }
       },
 
diff --git a/src/project/fengdu/AppCircle/Detail.vue b/src/project/fengdu/AppCircle/Detail.vue
index 2c392db..b18301f 100644
--- a/src/project/fengdu/AppCircle/Detail.vue
+++ b/src/project/fengdu/AppCircle/Detail.vue
@@ -219,6 +219,17 @@ div<template>
       },
 
       send () {
+        if (!this.user.AreaId) {
+          this.$dialog.confirm({
+            content: '您只有完成信息认证后，才可进行相关操作。',
+            confirmText: '去认证'
+          }).then(() => {
+            this.$linkTo('../AppMine/userInfo')
+          }).catch(() => {
+          })
+
+          return false
+        }
         if (!this.content) {
           return this.$toast('内容不能为空')
         }
diff --git a/src/project/fengdu/AppCircle/MyPostList.vue b/src/project/fengdu/AppCircle/MyPostList.vue
index a1fca7b..4ffa26b 100644
--- a/src/project/fengdu/AppCircle/MyPostList.vue
+++ b/src/project/fengdu/AppCircle/MyPostList.vue
@@ -25,14 +25,19 @@
     </div>
     <div class="body">
       <div class="body-list" v-if="currIndex === 0">
-        <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item"
+          v-for="(item, index) in list"
+          :key="index"
+          hover-class="text-hover"
+          hover-stop-propagation
+          @click="$linkTo('./Detail?id=' + item.id + '&name=' + item.topicName + '&themeId=' + item.themeId)">
           <div class="item-top">
             <image class="avatar" :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
             <div class="right">
               <h3>{{ item.createUserName }}</h3>
               <span v-if="item.publishDepartName">{{ item.publishDepartName }}</span>
             </div>
-            <image @click="remove(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png" />
+            <image hover-stop-propagation @click.stop="remove(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png" />
           </div>
           <div class="item-content">
             <span v-if="item.themeId" @click.stop="$linkTo('./TopicDetail?themeId=' + item.themeId + '&name=' + item.topicName)">#【{{ item.topicName }}】</span>
@@ -59,14 +64,19 @@
         </div>
       </div>
       <div class="body-list" v-if="currIndex === 1">
-        <div class="item" v-for="(item, index) in list" :key="index">
+        <div class="item"
+          v-for="(item, index) in list"
+          :key="index"
+          hover-class="text-hover"
+          hover-stop-propagation
+          @click="$linkTo('./Detail?id=' + item.id + '&name=' + item.topicName + '&themeId=' + item.themeId)">
           <div class="item-top">
             <image class="avatar" :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
             <div class="right">
               <h3>{{ item.createUserName }}</h3>
               <span v-if="item.publishDepartName">{{ item.publishDepartName }}</span>
             </div>
-            <image @click="removeComment(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png" />
+            <image hover-stop-propagation @click.stop="removeComment(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png" />
           </div>
           <div class="item-content">
             <span v-if="item.themeId" @click.stop="$linkTo('./TopicDetail?themeId=' + item.themeId + '&name=' + item.topicName)">#【{{ item.topicName }}】</span>
@@ -96,10 +106,13 @@
         <div class="comment-item" v-for="(item, index) in list" :key="index">
           <div class="comment-top">
             <span>{{ item.myComment.createTime }}</span>
-            <image @click="removeComment(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png" />
+            <image hover-stop-propagation  @click.stop="removeComment(item.id)" class="remove" src="https://cdn.cunwuyun.cn/wxmp/fengdu/ic-delete.png" />
           </div>
           <p>{{ item.myComment.content }}</p>
-          <div class="bottom">
+          <div
+            class="bottom"
+            hover-class="text-hover"
+            @click="$linkTo('./Detail?id=' + item.id + '&name=' + item.topicName + '&themeId=' + item.themeId)">
             <div class="item-top">
               <image class="avatar" :src="item.createUserAvatar || 'https://cdn.cunwuyun.cn/wxmp/fengdu/avatar.png'" />
               <div class="right">
@@ -563,6 +576,12 @@
           margin: 16px 0;
           line-height: 1.3;
           text-align: justify;
+          word-break: break-all;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
 
           span {
             font-size: 28px;
@@ -671,7 +690,13 @@
         .item-content {
           margin: 16px 0;
           line-height: 1.3;
-          // text-align: justify;
+          text-align: justify;
+          word-break: break-all;
+          text-overflow: ellipsis;
+          overflow: hidden;
+          display: -webkit-box;
+          -webkit-box-orient: vertical;
+          -webkit-line-clamp: 2;
 
           span {
             font-size: 28px;