From 0990b25d1df255f2a4d4a8c4f6b07ce7b1d76ca8 Mon Sep 17 00:00:00 2001
From: 13405411873 <1994398261@qq.com>
Date: Mon, 12 May 2025 13:59:02 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  7 +------
 config.js                           |  4 ++--
 pages/components/my-notice-item.vue |  4 +++-
 pages/components/notice-index.vue   | 12 +++++-------
 pages/components/notice-item.vue    | 10 +++++-----
 pages/index.vue                     |  6 ++++++
 pages/login.vue                     |  3 ++-
 pages/mine/member/member-index.vue  | 18 ++++++++++++------
 pages/notice/detail.vue             |  3 ++-
 utils/request.js                    | 12 ++++++++++--
 10 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/App.vue b/App.vue
index 8a518fc..2a0cdb3 100644
--- a/App.vue
+++ b/App.vue
@@ -38,11 +38,6 @@
 			},
 			initConfig() {
 				this.globalData.config = config
-			},
-			checkLogin() {
-				if (!getToken()) {
-					this.$tab.reLaunch('/pages/login')
-				}
 			}
 		}
 	}
@@ -50,4 +45,4 @@
 
 <style lang="scss">
 	@import '@/static/scss/index.scss';
-</style>
+</style>
\ No newline at end of file
diff --git a/config.js b/config.js
index cc7d138..e49fb22 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
 	//baseUrl: 'https://3w823u8516.vicp.fun/noticeApi',
-	//baseUrl: 'https://www.ddtg.site/noticeApi',
-	baseUrl: 'http://192.168.1.31:8088',
+	baseUrl: 'https://www.ddtg.site/noticeApi',
+	//baseUrl: 'http://192.168.1.6:8088',
 	// 应用信息
 	appInfo: {
 		// 应用名称
diff --git a/pages/components/my-notice-item.vue b/pages/components/my-notice-item.vue
index 614f7b4..cb0acc9 100644
--- a/pages/components/my-notice-item.vue
+++ b/pages/components/my-notice-item.vue
@@ -12,6 +12,8 @@
 			</view>
 			<!-- 操作按钮 -->
 			<view class="opt-button-box">
+				<view style="flex: 1;display: flex;align-items: self-start;">报名卡片：{{item.cardName}}</view>
+
 				<view class="opt-item" v-if="item.signStatus=='已通过'&&item.isEvaluate == 0" @click="evaluate(item)">评价
 				</view>
 				<view class="opt-item" @click="goDetail(item)">查看详情</view>
@@ -181,4 +183,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/components/notice-index.vue b/pages/components/notice-index.vue
index 7698c54..4249747 100644
--- a/pages/components/notice-index.vue
+++ b/pages/components/notice-index.vue
@@ -202,7 +202,8 @@
 	import constant from '@/utils/constant';
 	import store from '@/store'
 	import {
-		changeUserType
+		changeUserType,
+		showConfirm
 	} from '@/utils/common.js'
 	import {
 		treeCity
@@ -569,11 +570,8 @@
 			goDetail(item) {
 				let userInfo = getJSONData(constant.userInfo)
 				if (!userInfo) {
-					store.dispatch('LogOut').then(res => {
-						uni.reLaunch({
-							url: '/pages/login'
-						})
-					})
+					console.log(572);
+					this.$tab.navigateTo(`/pages/notice/detail?id=${item.id}`)
 				} else {
 
 					let userType = getUserType()
@@ -1007,4 +1005,4 @@
 	.text-color {
 		color: #929292 !important;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/components/notice-item.vue b/pages/components/notice-item.vue
index 8eb7585..aee691b 100644
--- a/pages/components/notice-item.vue
+++ b/pages/components/notice-item.vue
@@ -13,8 +13,7 @@
 				<view class="left-text">
 					<view class="text-item">
 						<image class="dl-icon" src="@/static/index/money.png" mode="aspectFit"></image>
-						<view v-if="null==item.feeUp" class="dl-content">奖励：无稿费</view>
-						<view v-else class="dl-content">奖励：¥{{item.feeDown}}-{{item.feeUp}}</view>
+						<view class="dl-content">奖励：¥{{item.feeDown}}-{{item.feeUp==null?'无上限':item.feeUp}}</view>
 					</view>
 					<view class="text-item">
 						<image class="dl-icon" src="@/static/index/my.png" mode="aspectFit"></image>
@@ -59,8 +58,9 @@
 				<view class="left-text">
 					<view class="text-item">
 						<image class="dl-icon" src="@/static/index/money.png" mode="aspectFit"></image>
-						<view v-if="null==dataObj.feeUp" class="dl-content">奖励：无稿费</view>
-						<view v-else class="dl-content">奖励：¥{{dataObj.feeDown}}-{{dataObj.feeUp}}</view>
+
+						<view class="dl-content">奖励：¥{{dataObj.feeDown}}-{{dataObj.feeUp==null?'无上限':dataObj.feeUp}}
+						</view>
 					</view>
 					<view class="text-item">
 						<image class="dl-icon" src="@/static/index/my.png" mode="aspectFit"></image>
@@ -70,7 +70,7 @@
 					</view>
 					<view class="text-item" style="border-bottom: 1rpx solid #F4F4F4;padding-bottom: 10rpx;">
 						<image class="dl-icon" src="@/static/index/xing.png" mode="aspectFit"></image>
-						<view class="dl-content">类型：{{dataObj.bloggerTypesText}}</view>
+						<view class="dl-content">类型：{{dataObj.bloggerTypesText||'无限制'}}</view>
 					</view>
 					<view class="text-item" style="padding-top: 10rpx;">
 						<view class="item-box">
diff --git a/pages/index.vue b/pages/index.vue
index e6c90ff..9396cf5 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -117,6 +117,12 @@
 				} else {
 					console.error('Component not found');
 				}
+				if (this.$refs.myNotice) {
+					this.$refs.myNotice.search()
+				}
+				if (this.$refs.myNoticeTg) {
+					this.$refs.myNoticeTg.search()
+				}
 			});
 			this.refreshUserType()
 			setTimeout(() => {
diff --git a/pages/login.vue b/pages/login.vue
index 45d40bc..08e87aa 100644
--- a/pages/login.vue
+++ b/pages/login.vue
@@ -134,6 +134,7 @@
 			},
 			//微信授权登录
 			async getPhone(e) {
+				console.log(this.ifAgree, 137);
 				if (!this.ifAgree) {
 					toast("请先阅读并同意《隐私协议》《用户服务协议》")
 					return
@@ -314,4 +315,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/mine/member/member-index.vue b/pages/mine/member/member-index.vue
index 74181d0..258b46b 100644
--- a/pages/mine/member/member-index.vue
+++ b/pages/mine/member/member-index.vue
@@ -61,7 +61,8 @@
 
 <script>
 	import {
-		toast
+		toast,
+		showConfirm
 	} from '@/utils/common.js'
 	import {
 		getJSONData
@@ -130,10 +131,15 @@
 			goDetail(item) {
 				let userInfo = getJSONData(constant.userInfo)
 				if (!userInfo) {
-					store.dispatch('LogOut').then(res => {
-						uni.reLaunch({
-							url: '/pages/login'
-						})
+					showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+						if (res.confirm) {
+							store.dispatch('LogOut').then(res => {
+								console.log('跳转');
+								uni.navigateTo({
+									url: '/pages/login'
+								})
+							})
+						}
 					})
 				} else {
 
@@ -479,4 +485,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index c1063ed..6488871 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -363,6 +363,7 @@
 
 		},
 		onShow() {
+			console.log(366);
 			if (null != getJSONData(constant.userInfo)) {
 				this.userInfo = getJSONData(constant.userInfo)
 			}
@@ -1039,4 +1040,4 @@
 			}
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/utils/request.js b/utils/request.js
index 22d23d1..06c6a5f 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -44,9 +44,17 @@ const request = config => {
 				const code = res.data.code || 200
 				const msg = errorCode[code] || res.data.msg || errorCode['default']
 				if (code === 401) {
-					uni.navigateTo({
-						url: '/pages/login?canBack=true'
+					showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
+						if (res.confirm) {
+							store.dispatch('LogOut').then(res => {
+								console.log('跳转');
+								uni.navigateTo({
+									url: '/pages/login?canBack=true'
+								})
+							})
+						}
 					})
+
 				} else if (code === 500) {
 					toast(msg)
 					reject(msg)