2

store/actions/actions.js

@@ -2,18 +2,23 @@ import Vue from "vue";
 const vm = new Vue();
 export default {
 	// 获取区号
-	gainAreaCode({commit}){
+	gainAreaCode({
+		commit
+	}) {
 		return new Promise((resolve, reject) => {
-		  vm.$Request.post('login/countryList',{}).then((res) => {
+			vm.$Request.post('login/countryList', {}).then((res) => {
 				if (res.success && res.data) {
 					commit('setAreaCode', res.data); //存储区号
 				}
 				resolve();
-		  });
+			});
 		})
 	},
 	// 设置初始区号
-	setInitialCode ({commit, state}) {
+	setInitialCode({
+		commit,
+		state
+	}) {
 		// console.log(JSON.stringify(state.areaCode) + 'state.areaCode')
 		return new Promise((resolve, reject) => {
 			state.areaCode.forEach((item) => {
@@ -24,9 +29,12 @@ export default {
 		})
 	},
 	// 获取用户信息
-	gainUserData ({commit, state}) {
+	gainUserData({
+		commit,
+		state
+	}) {
 		return new Promise((resolve, reject) => {
-			vm.$Request.post('User/Details',{
+			vm.$Request.post('User/Details', {
 				user_id: vm.$store.state.userId,
 			}).then((res) => {
 				if (res.status == 200 && res.data) {
@@ -36,7 +44,8 @@ export default {
 					}); //存储用户信息
 					setTimeout(async () => {
 						if (window.web3 && window.web3.eth) {
-							vm.$Common.getCoinNum(vm.$store.state.myAddress,'usdt').then((num) => {
+							vm.$Common.getCoinNum(vm.$store.state.myAddress, 'usdt').then((
+								num) => {
 								let usdtNum = 0.00
 								if (num) {
 									usdtNum = num.toFixed(2)
@@ -46,87 +55,107 @@ export default {
 									...res.data[0]
 								}); //存储用户信息
 							})
-						} else if(window.tronWeb) {
-							let num = await window.tronWeb.trx.getBalance(vm.$store.state.myAddress);
+						} else if (window.tronWeb) {
+							let num = await window.tronWeb.trx.getBalance(vm.$store.state
+								.myAddress);
 							commit('setUserData', {
 								usdtNum: num,
 								...res.data[0]
 							}); //存储用户信息
 						}
-					},500)
-					
+					}, 500)
+
 				}
 				resolve();
 			});
 		})
 	},
-	
+
 	// 获取报错信息
-	gainErrorNews({commit}){
+	gainErrorNews({
+		commit
+	}) {
 		return new Promise((resolve, reject) => {
-		  vm.$Request.post('Error/getInfo',{}).then((res) => {
+			vm.$Request.post('Error/getInfo', {}).then((res) => {
 				if (res.status == 200 && res.data) {
 					commit('setErrorNews', res.data); //存储区号
 				}
 				resolve();
-		  });
+			});
 		})
 	},
-	
+
 	// 获取公告列表
-	gainNoticeList({commit, state}){
+	gainNoticeList({
+		commit,
+		state
+	}) {
 		// commit('setNoticeList', []); 
 		// commit('setNoticeTime', 0); //存储最大时间
 		return new Promise((resolve, reject) => {
-		  vm.$Request.post('Notice/GetList',{}, false).then((res) => {
+			vm.$Request.post('Notice/GetList', {}, false).then((res) => {
 				if (res.status == 200 && res.data && res.data.length) {
 					let time = 0
 					commit('setNewNoticeList', res.data); //返回接口返回的顺序列表
-					res.data.forEach((item) => {
-						if (time <= item.time) {
-							time = item.time
-						}
-						console.log('公告最新时间戳:' + state.noticeTime)
-						if (item.time > state.noticeTime) {
-							var result = [];
-							if (state.noticeList && state.noticeList.length) {
-								result = state.noticeList.filter((a,i)=>{
-								  return item.notice_id == a.notice_id;
-								})
-							}
-							// console.log('state.noticeList')
-							// console.log(state.noticeList)
-							// console.log('result')
-							// console.log(result)
-							if (!result.length) {
-								console.log('有新公告， 弹出')
-								commit('setNoticeOpen', true); //是否弹窗公告详情
-								console.log(state.noticeOpen)
-								if (state.noticeList && state.noticeList.length) {
-									commit('setNoticeList', [item, ...state.noticeList]); //存储
-								} else {
-									commit('setNoticeList', [item]); //存储
-								}
-								
-							}
+					// console.log('1111', res.data);
+					
+						if (res.data[0].isread == 0) {
+							commit('setNoticeList',  res.data);
+							commit('setNoticeOpen', true);
+							return false
+						}else {
+							commit('setNoticeList',  res.data);
 						}
-					});
-					commit('setNoticeTime', time); //存储最大时间
+						return false
+					// })
+					
+					// res.data.forEach((item) => {
+					// 	if (time <= item.time) {
+					// 		time = item.time
+					// 	}
+					// 	console.log('公告最新时间戳:' + state.noticeTime)
+					// 	if (item.time > state.noticeTime) {
+					// 		var result = [];
+					// 		if (state.noticeList && state.noticeList.length) {
+					// 			result = state.noticeList.filter((a, i) => {
+					// 				return item.notice_id == a.notice_id;
+					// 			})
+					// 		}
+					// 		// console.log('state.noticeList')
+					// 		// console.log(state.noticeList)
+					// 		// console.log('result')
+					// 		// console.log(result)
+					// 		if (!result.length) {
+					// 			console.log('有新公告， 弹出')
+					// 			commit('setNoticeOpen', true); //是否弹窗公告详情
+					// 			console.log(state.noticeOpen)
+					// 			if (state.noticeList && state.noticeList.length) {
+					// 				commit('setNoticeList', [item, ...state.noticeList]); //存储
+					// 			} else {
+					// 				commit('setNoticeList', [item]); //存储
+					// 			}
+
+					// 		}
+					// 	}
+					// });
+					// commit('setNoticeTime', time); //存储最大时间
 				}
 				resolve();
-		  });
+			});
 		})
 	},
-	
+
 	// 判断邮箱是否已读
-	gainMailisRead({commit}){
+	gainMailisRead({
+		commit
+	}) {
 		return new Promise((resolve, reject) => {
-		  vm.$Request.post('Mail/mailisRead',{}).then((res) => {
+			vm.$Request.post('Mail/mailisRead', {}).then((res) => {
 				if (res.status == 200 && res.data) {
 					commit('setMailisRead', res.data.isRead); //存储区号
 				}
 				resolve();
-		  });
+			});
 		})
 	},
-}
+}

store/mutations/mutations.js

@@ -71,4 +71,7 @@ export default {
 	setVerifyCode (state, data) {
 		state.verifyCode = data
 	},
+	setNoticeModel (state, data) {
+		state.noticeModel = data
+	},
 }

store/state/state.js

@@ -13,7 +13,8 @@ export default {
 	noticeList: null, //公告列表
 	newNoticeList: [], //公告列表 接口返回排序
 	noticeTime: 0,
-	noticeOpen: false, //是否弹出公告弹窗
+	noticeOpen: false, //是否弹出公告
+	noticeModel:false, //是否弹出公告
 	paused: false, // 记住音乐播放状态 true 不播放  false 播放
 	isRead: 1, //isRead=0标记小红点，isRead=1取消小红点
 	webData: null, //记住后端返回的链信息