fix: 引用回复被错误的显示为禁言

1. 修复引用回复被错误的显示为禁言 2. 精选回复里不需要展示引用回复 3. 升级nutui-taro解决sass警告
linuxdeepin · Jan 20, 2025 · 59b862a · 59b862a
1 parent b6fc68a
commit 59b862a
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 62 deletions.
diff --git a/components.d.ts b/components.d.ts
@@ -1,11 +1,11 @@
-// generated by unplugin-vue-components
-// We suggest you to commit this file into source control
+/* eslint-disable */
+// @ts-nocheck
+// Generated by unplugin-vue-components
 // Read more: https://github.com/vuejs/core/pull/3399
-import '@vue/runtime-core'
-
 export {}
 
-declare module '@vue/runtime-core' {
+/* prettier-ignore */
+declare module 'vue' {
   export interface GlobalComponents {
     NutActionSheet: typeof import('@nutui/nutui-taro')['ActionSheet']
     NutAvatar: typeof import('@nutui/nutui-taro')['Avatar']

diff --git a/package.json b/package.json
@@ -37,7 +37,7 @@
 	"dependencies": {
 		"@babel/runtime": "^7.25.0",
 		"@nutui/icons-vue-taro": "^0.0.9",
-		"@nutui/nutui-taro": "^4.3.11",
+		"@nutui/nutui-taro": "^4.3.13",
 		"@tarojs/components": "4.0.4",
 		"@tarojs/helper": "4.0.4",
 		"@tarojs/plugin-framework-vue3": "4.0.4",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/pages/thread/thread.vue b/src/pages/thread/thread.vue
@@ -88,24 +88,6 @@
                             </nut-cell>
                             <nut-cell class="content" desc-text-align="left">
                                 <template #desc>
-                                    <view class="son-post" v-if="post.son_post?.id">
-                                        <span class="nickname"> {{ post.son_post.user.nickname }}：</span>
-                                        <template v-if="post.user.state === 0 || post.user.state === 1">
-                                            <view v-if="post.son_post.deleted_at === null"
-                                                class="post-message html-message taro_html vditor-reset"
-                                                @click="htmlClick($event)" v-html="post.son_post.message">
-                                            </view>
-                                            <view v-else
-                                                class="post-message html-message taro_html vditor-reset del-message">
-                                                该评论已删除!
-                                            </view>
-                                        </template>
-
-                                        <view v-else-if="post.user.state === 2"
-                                            class="post-message html-message taro_html vditor-reset del-message">
-                                            用户被禁言，该内容已隐藏
-                                        </view>
-                                    </view>
                                     <template v-if="post.user.state === 0 || post.user.state === 1">
                                         <view v-if="post.deleted_at === null"
                                             class="post-message html-message taro_html vditor-reset"
@@ -160,11 +142,13 @@
                                         </view>
                                     </template>
                                 </nut-cell>
+                                <!-- 回帖内容 -->
                                 <nut-cell class="content" desc-text-align="left">
                                     <template #desc>
+                                        <!-- 引用的回复 -->
                                         <view class="son-post" v-if="post.son_post?.id">
                                             <span class="nickname"> {{ post.son_post.user.nickname }}：</span>
-                                            <template v-if="post.user.state === 0 || post.user.state === 1">
+                                            <template v-if="post.son_post.user.state !== 2">
                                                 <view v-if="post.son_post.deleted_at === null"
                                                     class="post-message html-message taro_html vditor-reset"
                                                     @click="htmlClick($event)" v-html="post.son_post.message">
@@ -175,7 +159,7 @@
                                                 </view>
                                             </template>
 
-                                            <view v-else-if="post.user.state === 2"
+                                            <view v-else
                                                 class="post-message html-message taro_html vditor-reset del-message">
                                                 用户被禁言，该内容已隐藏
                                             </view>
@@ -613,7 +597,7 @@ Taro.eventCenter.on("sendPost", sendPost)
 
 // 定时刷新评论
 // 如果当前位于评论的最后一页,每三秒刷新一次
-const interval = ref<NodeJS.Timeout>()
+const interval = ref<ReturnType<typeof setTimeout>>()
 const intervalRefreshPost = ref(false)
 watchEffect(() => {
     if (!threadPosts.value)