From 2286d6b3ad83fd25100aef7d8c849fe1e8e77e24 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 28 Apr 2025 15:02:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=80=9A=E7=9F=A5=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/components/notice-item.vue |  7 ++++
 pages/mine/mine-index.vue        |  1 +
 pages/notice/detail.vue          | 55 ++++++++++++++++++--------------
 pages/notice/subscribe-set.vue   |  4 +--
 4 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/pages/components/notice-item.vue b/pages/components/notice-item.vue
index 314bd9d..08bfcb5 100644
--- a/pages/components/notice-item.vue
+++ b/pages/components/notice-item.vue
@@ -77,6 +77,13 @@
 							<image class="dl-icon3" src="@/static/index/eye.png" mode="aspectFit"></image>
 							<view class="dl-item-right dl-number">{{dataObj.viewNum}}</view>
 						</view>
+
+						<view class="item-box" style="width: 25%;">
+
+							<view>
+								{{dataObj.isPlatformFree==1?'平台结算':''}}
+							</view>
+						</view>
 					</view>
 				</view>
 				<image class="right-image" :src="imageUrl+dataObj.mainImage" mode="aspectFit"></image>
diff --git a/pages/mine/mine-index.vue b/pages/mine/mine-index.vue
index 9cfa320..6fb0ea4 100644
--- a/pages/mine/mine-index.vue
+++ b/pages/mine/mine-index.vue
@@ -260,6 +260,7 @@
 					userId: this.userInfo.userId,
 					userType: this.localUserType
 				}).then(res => {
+					this.userInfo.nickName = res.data.nickName.toString()
 					this.userInfo.tfansNum = res.data.tfansNum.toString()
 					this.userInfo.pointsBalance = res.data.pointsBalance.toString()
 					this.userInfo.report = res.data.report.toString()
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index 79f739f..fce09b7 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -154,8 +154,8 @@
 					</view>
 				</view>
 			</view>
-			<!-- 报名列表 -->
-			<view class="info-box notice-detail" v-if="!viewMy">
+			<!-- 报名列表  暂时注释-->
+			<!-- 			<view class="info-box notice-detail" v-if="!viewMy">
 				<view class="detail-title">已报名：{{allImgNum}}人</view>
 				<view class="image-box" v-if="imageArray.length>0"
 					:style="{height:(imageArray.length*(imageWidth+10)+20)+'rpx'}">
@@ -171,7 +171,7 @@
 
 					</view>
 				</view>
-			</view>
+			</view> -->
 			<!-- 去报名，始终浮动下方 -->
 			<view class="dl-bottom-box" v-show="showBottom&&type=='common'">
 				<!-- 报名 -->
@@ -228,7 +228,8 @@
 		calculateTimeDifference
 	} from '@/utils/common.js'
 	import {
-		getJSONData
+		getJSONData,
+		getToken
 	} from '@/utils/auth.js'
 	import {
 		getNoticeDetail,
@@ -458,22 +459,25 @@
 			 * 浏览通告
 			 */
 			viewNotice() {
-				let userId = null
-				if (null != this.userInfo) {
-					userId = this.userInfo.userId
-				}
-				addView({
-					noticeId: this.noticeId,
-					userId: userId
-				}).then(res => {
+				if (getToken()) {
+					let userId = null
+					if (null != this.userInfo) {
+						userId = this.userInfo.userId
+					}
+					addView({
+						noticeId: this.noticeId,
+						userId: userId
+					}).then(res => {
+
+					}).catch((e) => {
+						uni.showToast({
+							icon: 'error',
+							duration: 2000,
+							title: e
+						});
+					})
+				}
 
-				}).catch((e) => {
-					uni.showToast({
-						icon: 'error',
-						duration: 2000,
-						title: e
-					});
-				})
 			},
 			// 回调图片地址
 			shareSuccess(e) {
@@ -591,11 +595,14 @@
 			 * 判断用户类型
 			 */
 			checkUserType() {
-				let userType = getUserType()
-				if (constant.bz != userType) {
-					//不是博主
-					this.ifBz = false
+				if (getToken()) {
+					let userType = getUserType()
+					if (constant.bz != userType) {
+						//不是博主
+						this.ifBz = false
+					}
 				}
+
 			},
 			/**
 			 * 切换当前用户类型为博主
@@ -915,7 +922,7 @@
 				width: 100%;
 
 				.report-box {
-          width: calc(100% - 60rpx);
+					width: calc(100% - 60rpx);
 					display: flex;
 					justify-content: center;
 					align-items: center;
diff --git a/pages/notice/subscribe-set.vue b/pages/notice/subscribe-set.vue
index 93eda2c..9962b13 100644
--- a/pages/notice/subscribe-set.vue
+++ b/pages/notice/subscribe-set.vue
@@ -112,7 +112,7 @@
 							<switch v-else style="float: right;display: flex;" color="#FC1F3E"
 								@change="switchChange($event,'newNotice')" />
 						</view>
-						<view class="seting-view"><text>订阅通告主新通告</text>
+						<view class="seting-view"><text>关注的通告主新通告</text>
 							<switch v-if="dataObj.forkNotice" style="float: right;display: flex;" checked
 								color="#FC1F3E" @change="switchChange($event,'forkNotice')" />
 							<switch v-else style="float: right;display: flex;" color="#FC1F3E"
@@ -495,4 +495,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file