From 58adeb08de47edb38c00766b63cd87c6b41e7ddd Mon Sep 17 00:00:00 2001
From: lnn19986213 <1667908750@qq.com>
Date: Mon, 29 Jan 2024 14:03:30 +0800
Subject: [PATCH] gx

---
 src/pages/pageHome/pageHome.vue | 29 +++++++++++++++++++++++++++++
 src/pagesA/my/My.vue            |  4 +++-
 src/pagesA/my/logOut.vue        |  4 ++--
 src/request/interface.js        |  8 ++++----
 4 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/src/pages/pageHome/pageHome.vue b/src/pages/pageHome/pageHome.vue
index 8570a17..2235277 100644
--- a/src/pages/pageHome/pageHome.vue
+++ b/src/pages/pageHome/pageHome.vue
@@ -137,6 +137,7 @@
 				</view> -->
 			</view>
 			<u-gap height="12"></u-gap>
+			<u-modal :show="isUnread" content='您有一条未读消息' :closeOnClickOverlay="true" @confirm="toMsg()" @close="isUnread=false"></u-modal>
 			<view class="not">
 				<view class="notice">
 					本服务由象山县文学艺术界联合会提供
@@ -159,6 +160,7 @@
 		data() {
 			return {
 				load: true,
+				isUnread: false,
 				artValue: '',
 				statusHeight: 0,
 				titleHeight: 50,
@@ -362,6 +364,7 @@
 				this.http.request('/indexImage/sybjt', {}, "GET").then(res => {
 					if (res.code == 200) {
 						this.background = res.data[0].imagePath
+						this.getTalkList()
 						this.load = false
 					}
 				}).catch(e => {
@@ -371,6 +374,27 @@
 					});
 				})
 			},
+			//未读
+			getTalkList() {
+				let _this = this;
+				this.http
+					.request("/chat/lists", {}, "GET")
+					.then((res) => {
+						if (res.code == 200) {
+							if (res.data.length > 0) {
+								res.data.forEach(function(item) {
+									if (item.unread > 0) _this.isUnread = true;
+								});
+							}
+						}
+					})
+					.catch((e) => {
+						uni.showToast({
+							title: e.data.message,
+							icon: "none",
+						});
+					});
+			},
 			navigateToFun(url) {
 				uni.navigateTo({
 					url
@@ -425,6 +449,11 @@
 						break;
 				}
 			},
+			toMsg(){
+				uni.navigateTo({
+					url: "/pagesA/msg/msg",
+				})
+			},
 			famouserDetaol(val) {
 				uni.navigateTo({
 					url: "/pagesC/famousArts/famousArts?id=" + val
diff --git a/src/pagesA/my/My.vue b/src/pagesA/my/My.vue
index da6cce7..98b599c 100644
--- a/src/pagesA/my/My.vue
+++ b/src/pagesA/my/My.vue
@@ -195,7 +195,9 @@
 							this.userId = res.data.id;
 							this.yhsf = res.data.yhsf;
 							this.point = res.data.point;
-							this.association = res.data.association.name
+							if(this.yhsf == '文艺工作者' && res.data.association.name){
+								this.association = res.data.association.name
+							}
 							this.getCol();
 						}
 					})
diff --git a/src/pagesA/my/logOut.vue b/src/pagesA/my/logOut.vue
index a6c7c15..63a0dda 100644
--- a/src/pagesA/my/logOut.vue
+++ b/src/pagesA/my/logOut.vue
@@ -20,8 +20,8 @@
 				this.http.request('/auth/logout', {}, "GET").then(res => {
 					if (res.code == 200) {
 						uni.redirectTo({
-						    // url: "/pages/pageHome/shwxLogin",        //h5
-							url: '/pagesC/Login/Login'          //小程序
+						    url: "/pages/pageHome/shwxLogin",        //h5
+							// url: '/pagesC/Login/Login'          //小程序
 						})
 					}
 				}).catch(e => {
diff --git a/src/request/interface.js b/src/request/interface.js
index 74419d0..2083cfe 100644
--- a/src/request/interface.js
+++ b/src/request/interface.js
@@ -5,10 +5,10 @@
 
 export default {
 	config: {
-		baseUrl: "http://192.168.2.48:8080/h5/api",  //俞燕红-小程序不能配跨域
+		// baseUrl: "http://192.168.2.48:8080/h5/api",  //俞燕红-小程序不能配跨域
 		// baseUrl: "/pre",  //俞燕红-跨域
 		// baseUrl: "https://yxx.ydool.net/h5/api", //线上
-		// baseUrl: "/h5/api", //h5 
+		baseUrl: "/h5/api", //h5 
 		header: {
 			'Content-Type': 'application/json;charset=UTF-8',
 			// 'Content-Type':'application/x-www-form-urlencoded'
@@ -104,8 +104,8 @@ export default {
 					});
 					setTimeout(() => {
 						uni.navigateTo({
-							url: '/pagesC/Login/Login'      //小程序跳转
-							// url: '/pages/pageHome/shwxLogin'   //h5-山海万象跳转
+							// url: '/pagesC/Login/Login'      //小程序跳转
+							url: '/pages/pageHome/shwxLogin'   //h5-山海万象跳转
 						})
 					}, 1200)