From be96abbeda599d4a40db4ade5a5f491e80ed506d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?kaizheng=28=E9=83=91=E5=87=AF=29?= <kaizheng@upchina.com>
Date: Fri, 28 Feb 2025 14:38:28 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintrc.js                                  | 22 +++++----
 src/utils/request.js                          |  2 +-
 .../circle/detail/components/newsList.vue     | 12 ++---
 .../detail/components/userLnteractList.vue    | 46 +++++++++----------
 4 files changed, 44 insertions(+), 38 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index b495017..4781d94 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -72,13 +72,7 @@ module.exports = {
       }
     ],
     "handle-callback-err": [2, "^(err|error)$"],
-    indent: [
-      2,
-      2,
-      {
-        SwitchCase: 1
-      }
-    ],
+    indent: off,
     "jsx-quotes": [2, "prefer-single"],
     "key-spacing": [
       2,
@@ -270,6 +264,18 @@ module.exports = {
         objectsInObjects: false
       }
     ],
-    "array-bracket-spacing": [2, "never"]
+    "array-bracket-spacing": [2, "never"],
+    "vue/html-self-closing": [
+      "error",
+      {
+        html: {
+          void: "always",
+          normal: "never",
+          component: "always"
+        },
+        svg: "always",
+        math: "always"
+      }
+    ]
   }
 };
diff --git a/src/utils/request.js b/src/utils/request.js
index 081deba..416c724 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -58,7 +58,7 @@ service.interceptors.response.use(
         setTimeout(() => {
           Message.closeAll();
           Message({
-            message: res.message,
+            message: `${res.message}-${res.requestId}`,
             duration: 2000,
             type: "error"
           });
diff --git a/src/views/circle/detail/components/newsList.vue b/src/views/circle/detail/components/newsList.vue
index 51cac89..27de62f 100644
--- a/src/views/circle/detail/components/newsList.vue
+++ b/src/views/circle/detail/components/newsList.vue
@@ -232,12 +232,12 @@ export default {
           showClose: false,
           type: "success"
         });
-        item.status = item.status === 1 ? 2 : 1;
-        this.$emit("modifyStateCallback", {
-          msgId: item.id,
-          status: item.status,
-          modifyType: 1
-        });
+        // item.status = item.status === 1 ? 2 : 1;
+        // this.$emit("modifyStateCallback", {
+        //   msgId: item.id,
+        //   status: item.status,
+        //   modifyType: 1
+        // });
       }
     }
   }
diff --git a/src/views/circle/detail/components/userLnteractList.vue b/src/views/circle/detail/components/userLnteractList.vue
index b7979c5..cf96046 100644
--- a/src/views/circle/detail/components/userLnteractList.vue
+++ b/src/views/circle/detail/components/userLnteractList.vue
@@ -13,7 +13,7 @@
       >
         <li v-for="(item, index) in list" :key="index">
           <div class="new-header">
-            <img :src="defaultAvatar.student">
+            <img :src="defaultAvatar.student" />
             <div class="news-info">
               <div class="news-info-top">
                 <div class="news-user">
@@ -21,9 +21,13 @@
                   <label
                     v-if="[1, 3].includes(item.userType)"
                     :class="[item.userType === 1 ? 'blue' : 'orange']"
-                  >{{ item.userType === 1 ? "老师" : "助教" }}</label>
+                    >{{ item.userType === 1 ? "老师" : "助教" }}</label
+                  >
                   <div v-if="item.userType !== 2">
-                    <span><i v-if="item.readCount">{{ item.readCount }}</i><i v-if="item.totalCount">{{ item.totalCount }}</i></span>
+                    <span
+                      ><i v-if="item.readCount">{{ item.readCount }}</i
+                      ><i v-if="item.totalCount">{{ item.totalCount }}</i></span
+                    >
                     <span>已读</span>
                   </div>
                 </div>
@@ -32,21 +36,17 @@
             </div>
             <div class="news-opt">
               <div class="flex">
-                <el-link
-                  type="success"
-                  @click="setReplyMsg(item)"
-                >引用</el-link>
-                <el-link
-                  v-if="item.userType === 2 && item.status === 1"
-                  type="success"
-                  @click="updateMessageStatus(item)"
-                >通过审核</el-link>
+                <el-link type="success" @click="setReplyMsg(item)"
+                  >引用</el-link
+                >
+                <el-link type="success" @click="updateMessageStatus(item)">{{
+                  item.status !== 2 ? "公开" : "取消公开"
+                }}</el-link>
               </div>
               <div class="flex">
-                <el-link
-                  type="success"
-                  @click="toPrivateChat(item)"
-                >私聊</el-link>
+                <el-link type="success" @click="toPrivateChat(item)"
+                  >私聊</el-link
+                >
 
                 <el-link type="success" @click="prohibition(item)">{{
                   item.isForbidden === 1 ? "取消禁言" : "禁言"
@@ -56,7 +56,7 @@
           </div>
           <div class="new-content">
             <p v-if="item.contentType === 1">{{ item.content }}</p>
-            <img v-else :src="item.content" alt="">
+            <img v-else :src="item.content" alt="" />
           </div>
         </li>
       </ul>
@@ -244,12 +244,12 @@ export default {
           showClose: false,
           type: "success"
         });
-        item.status = item.status === 1 ? 2 : 1;
-        this.modifyStateCallback({
-          msgId: item.id,
-          status: item.status,
-          modifyType: 1
-        });
+        // item.status = item.status === 1 ? 2 : 1;
+        // this.modifyStateCallback({
+        //   msgId: item.id,
+        //   status: item.status,
+        //   modifyType: 1
+        // });
       }
     },
     modifyStateCallback(item) {