From dc1b20623058c5f050c8452d58613e2f67f29998 Mon Sep 17 00:00:00 2001
From: dengxin <2390584170@qq.com>
Date: Wed, 20 Mar 2024 09:38:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B6=88=E6=81=AF=E5=A4=9A?=
 =?UTF-8?q?=E6=AC=A1=E8=A7=A6=E5=8F=91action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/recruit/subPage/MessageList.vue | 402 ++++++++++++++++----------
 store/getters.js                      |   1 -
 store/index.js                        |   2 -
 store/models/news_recruit.js          | 337 ---------------------
 vue.config.js                         |   4 +-
 5 files changed, 259 insertions(+), 487 deletions(-)
 delete mode 100644 store/models/news_recruit.js

diff --git a/pages/recruit/subPage/MessageList.vue b/pages/recruit/subPage/MessageList.vue
index d509ab6..3d74437 100644
--- a/pages/recruit/subPage/MessageList.vue
+++ b/pages/recruit/subPage/MessageList.vue
@@ -1,15 +1,15 @@
 <template>
 	<view class="body">
 		<CustomNavbar @back="back" titke="申请消息"></CustomNavbar>
-		<view v-for="(value,key) in data" class="newsList" @click="goList(value)" :key="key">
+		<view v-for="(value, key) in messageList" class="newsList" @click="goList(value)" :key="key">
 			<view class="newsIcon">
 				<image :src="value.icon" mode=""></image>
-				<view v-if="news_recruit.unread[value.id] > 0" class="point"></view>
+				<!-- <view v-if="news_recruit.unread[value.id] > 0" class="point"></view> -->
 			</view>
 			<view class="newsListRight">
 				<view class="head">
 					<view class="head_left">
-						{{value.title}}
+						{{ value.title }}
 					</view>
 					<!-- <view class="head_right" v-if="value.data.length > 0">
 						{{value.data[0][0][value.prop.time]}}
@@ -26,169 +26,281 @@
 </template>
 
 <script>
-	import {
-		mapGetters
-	} from 'vuex'
-	import CustomTabbar from '@/components/CustomTabbar/custom_tabbar.vue'
-	import CustomNavbar from '@/components/CustomNavbar/navbar.vue';
+import CustomTabbar from '@/components/CustomTabbar/custom_tabbar.vue'
+import CustomNavbar from '@/components/CustomNavbar/navbar.vue';
 
-	export default {
-		components: {CustomTabbar,CustomNavbar},
-		data() {
-			return {
-				loading: false
-			}
-		},
-		onLoad() {},
-		onShow() {
-			if (!this.$store.state.user.token) {
-				uni.redirectTo({
-					url: "/pages/login/login"
+export default {
+	components: { CustomTabbar, CustomNavbar },
+	data() {
+		return {
+			loading: false,
+			size: 20,
+			messageList: [{
+				id: "0",
+				title: "消息通知",
+				icon: "../../../static/img/notice.svg",
+				page: {
+					current: 0,
+					size: this.size,
+					total: this.size,
+				},
+				data: [],
+				prop: {
+					title: "title",
+					desc: (value) => {
+						if (value.data[0]) return value.data[0][0]["desc"];
+					},
+					time: "createTime",
+					isRead: "isRead",
+					listDesc: "desc",
+				},
+				navigateTo(item) {
+					uni.$once("getNewsDetail", (cb) => {
+						cb(item);
+					});
+					uni.navigateTo({
+						url: "/pages/news/newsDetail?type=0",
+					});
+				},
+			}, {
+				id: "1",
+				title: "任务申请",
+				icon: "../../../static/img/renwu.png",
+				page: {
+					current: 0,
+					size: this.size,
+					total: this.size,
+				},
+				data: [],
+				prop: {
+					title: "missionTitle",
+					desc: (value) => {
+						if (value.data[0])
+							return `您收到${value.data[0][0]["companyName"]}的任务`;
+					},
+					time: "createTime",
+					isRead: "status",
+					listDesc: "companyName",
+				},
+				navigateTo(item, dispatch) {
+					// dispatch("readNew", {
+					// 	key: "1",
+					// 	id: item.id,
+					// });
+					uni.navigateTo({
+						url: `/pages/projectInfo/projectInfo?type=1&missionNo=${encodeURIComponent(
+							item.missionNo
+						)}&id=${encodeURIComponent(item.id)}`,
+					});
+				},
+			}, {
+				id: "1",
+				title: "岗位申请",
+				icon: "../../../static/img/job_recruit.svg",
+				page: {
+					current: 0,
+					size: this.size,
+					total: this.size,
+				},
+				data: [],
+				prop: {
+					title: "missionTitle",
+					desc: (value) => {
+						if (value.data[0])
+							return `您收到${value.data[0][0]["companyName"]}的任务`;
+					},
+					time: "createTime",
+					isRead: "status",
+					listDesc: "companyName",
+				},
+				navigateTo(item, dispatch) {
+					// dispatch("readNew", {
+					// 	key: "1",
+					// 	id: item.id,
+					// });
+					uni.navigateTo({
+						url: `/pages/projectInfo/projectInfo?type=1&missionNo=${encodeURIComponent(
+							item.missionNo
+						)}&id=${encodeURIComponent(item.id)}`,
+					});
+				},
+			}, {
+				id: "1",
+				title: "个人户申请",
+				icon: "../../../static/img/own_recruit.svg",
+				page: {
+					current: 0,
+					size: this.size,
+					total: this.size,
+				},
+				data: [],
+				prop: {
+					title: "missionTitle",
+					desc: (value) => {
+						if (value.data[0])
+							return `您收到${value.data[0][0]["companyName"]}的任务`;
+					},
+					time: "createTime",
+					isRead: "status",
+					listDesc: "companyName",
+				},
+				navigateTo(item, dispatch) {
+					// dispatch("readNew", {
+					// 	key: "1",
+					// 	id: item.id,
+					// });
+					uni.navigateTo({
+						url: `/pages/projectInfo/projectInfo?type=1&missionNo=${encodeURIComponent(
+							item.missionNo
+						)}&id=${encodeURIComponent(item.id)}`,
+					});
+				},
+			},]
+		}
+	},
+	onLoad() { },
+	onShow() {
+		if (!this.$store.state.user.token) {
+			uni.redirectTo({
+				url: "/pages/login/login"
+			})
+		} else {
+			uni.$emit('newsReadChange')
+		}
+	},
+	// onPullDownRefresh() {
+	// 	this.loading = true
+	// 	this.$store.dispatch("newsInit").then(() => {
+	// 		this.loading = false
+	// 		uni.stopPullDownRefresh();
+	// 	}).catch(() => {
+	// 		this.loading = false
+	// 		uni.stopPullDownRefresh();
+	// 	})
+	// },
+	methods: {
+		goList(item) {
+			// if (item.data.length === 0) {
+			// 	uni.showToast({
+			// 		title: '暂无消息',
+			// 		icon: 'none'
+			// 	});
+			// 	return
+			// }
+			console.log(item.data)
+			// 任务推送、岗位推送、政策推送
+			if (item.title == '任务申请') {
+				console.log('任务申请')
+				uni.navigateTo({
+					url: './taskProjectList'
+				})
+			} else if (item.title == '岗位申请') {
+				console.log('岗位申请')
+				uni.navigateTo({
+					url: './jobProjectList'
+				})
+			} else if (item.title == '个人户申请') {
+				console.log('个人户申请')
+				uni.navigateTo({
+					url: './policyList'
 				})
 			} else {
-				uni.$emit('newsReadChange')
+				uni.navigateTo({
+					url: './newsList?type=' + item.id
+				})
 			}
 		},
-		onPullDownRefresh() {
-			this.loading = true
-			this.$store.dispatch("newsInit").then(() => {
-				this.loading = false
-				uni.stopPullDownRefresh();
-			}).catch(() => {
-				this.loading = false
-				uni.stopPullDownRefresh();
-			})
+		back() {
+			uni.reLaunch({ url: '/pages/my/my' })
 		},
-		methods: {
-			goList(item) {
-				// if (item.data.length === 0) {
-				// 	uni.showToast({
-				// 		title: '暂无消息',
-				// 		icon: 'none'
-				// 	});
-				// 	return
-				// }
-				console.log(item.data)
-				// 任务推送、岗位推送、政策推送
-				if(item.title == '任务申请') {
-					console.log('任务申请')
-					uni.navigateTo({
-						url: './taskProjectList'
-					})
-				} else if(item.title == '岗位申请') {
-					console.log('岗位申请')
-					uni.navigateTo({
-						url: './jobProjectList'
-					})
-				} else if(item.title == '个人户申请') {
-					console.log('个人户申请')
-					uni.navigateTo({
-						url: './policyList'
-					})
-				} else {
-					uni.navigateTo({
-						url: './newsList?type=' + item.id
-					})
-				}
-			},
-			back() {
-                uni.reLaunch({ url: '/pages/my/my' })
-            },
-		},
-		computed: {
-			...mapGetters(['news_recruit']),
-			data() {
-                console.log(this.news_recruit.data,'--------------------==========');
-				return this.news_recruit.data
-			}
-		}
-	}
+	},
+}
 </script>
 
 <style>
-	.content {
-		font-family: PingFangSC-Regular;
-		font-size: 28rpx;
-		color: #666666;
-		width: 560rpx;
-		overflow: hidden;
-		white-space: nowrap;
-		/*不换行*/
-		text-overflow: ellipsis;
-		/*超出部分文字以...显示*/
-	}
+.content {
+	font-family: PingFangSC-Regular;
+	font-size: 28rpx;
+	color: #666666;
+	width: 560rpx;
+	overflow: hidden;
+	white-space: nowrap;
+	/*不换行*/
+	text-overflow: ellipsis;
+	/*超出部分文字以...显示*/
+}
 
-	.head_right {
-		float: right;
-		font-family: PingFangSC-Regular;
-		font-size: 24rpx;
-		color: #CCCCCC;
-	}
+.head_right {
+	float: right;
+	font-family: PingFangSC-Regular;
+	font-size: 24rpx;
+	color: #CCCCCC;
+}
 
-	.head_left {
-		float: left;
-		font-family: PingFangSC-Regular;
-		font-size: 36rpx;
-		color: #333333;
-	}
+.head_left {
+	float: left;
+	font-family: PingFangSC-Regular;
+	font-size: 36rpx;
+	color: #333333;
+}
 
-	.head {
-		overflow: hidden;
-		width: 560rpx;
-	}
+.head {
+	overflow: hidden;
+	width: 560rpx;
+}
 
-	.newsListRight {
-		float: left;
-		width: 560rpx;
-		height: 50rpx;
-		line-height: 50rpx;
-		padding-left: 30rpx;
-	}
+.newsListRight {
+	float: left;
+	width: 560rpx;
+	height: 50rpx;
+	line-height: 50rpx;
+	padding-left: 30rpx;
+}
 
-	.newsList .newsIcon {
-		position: relative;
-		width: 100rpx;
-		height: 100rpx;
-		display: inline-block;
-		float: left;
-	}
+.newsList .newsIcon {
+	position: relative;
+	width: 100rpx;
+	height: 100rpx;
+	display: inline-block;
+	float: left;
+}
 
-	.newsList image {
-		width: 100rpx;
-		height: 100rpx;
-	}
+.newsList image {
+	width: 100rpx;
+	height: 100rpx;
+}
 
-	.newsList .point {
-		position: absolute;
-		top: 5rpx;
-		right: 10rpx;
-		width: 20rpx;
-		height: 20rpx;
-		background: red;
-		border-radius: 50%;
-	}
+.newsList .point {
+	position: absolute;
+	top: 5rpx;
+	right: 10rpx;
+	width: 20rpx;
+	height: 20rpx;
+	background: red;
+	border-radius: 50%;
+}
 
-	.newsList {
-		border-bottom: 1rpx solid #dddddd;
-		padding-bottom: 30rpx;
-		padding-right: 30rpx;
-		padding-top: 30rpx;
-		padding-left: 30rpx;
-		overflow: hidden;
-		display: flex;
-		align-items: center;
-	}
+.newsList {
+	border-bottom: 1rpx solid #dddddd;
+	padding-bottom: 30rpx;
+	padding-right: 30rpx;
+	padding-top: 30rpx;
+	padding-left: 30rpx;
+	overflow: hidden;
+	display: flex;
+	align-items: center;
+}
 
-	.body {
-		background-color: #fefefe;
-		/* padding-left: 30rpx;
+.body {
+	background-color: #fefefe;
+	/* padding-left: 30rpx;
 
 		width: 720rpx; */
-	}
+}
 
-	page {
-		background: #f6f6f6;
-	}
+page {
+	background: #f6f6f6;
+}
 </style>
 
 
diff --git a/store/getters.js b/store/getters.js
index fb057a9..b775e70 100644
--- a/store/getters.js
+++ b/store/getters.js
@@ -5,7 +5,6 @@ const getters = {
   userChecked:state=>state.user.userChecked,
   area: state => state.area,
   news: state=> state.news,
-  news_recruit: state=> state.news_recruit,
   auth: state => state.auth,
   authPass: (state,getters) => getters.auth.laborState && getters.auth.realNameState && getters.auth.bankCardState && getters.auth.insureState,
   authInfo: state => state.auth.authInfo,
diff --git a/store/index.js b/store/index.js
index e590055..5d5ec31 100644
--- a/store/index.js
+++ b/store/index.js
@@ -6,7 +6,6 @@ import user from './models/user.js'
 import area from './models/area.js'
 import auth from './models/auth.js'
 import news from './models/news.js'
-import news_recruit from './models/news_recruit.js'
 import vip from './models/vip.js'
 import face from './models/face.js'
 import authentication from './models/authentication.js'
@@ -18,7 +17,6 @@ const store = new Vuex.Store({
 		area,
 		auth,
 		news,
-		news_recruit,
 		vip,
 		face,
 		authentication
diff --git a/store/models/news_recruit.js b/store/models/news_recruit.js
deleted file mode 100644
index c710d6e..0000000
--- a/store/models/news_recruit.js
+++ /dev/null
@@ -1,337 +0,0 @@
-import {
-  inviteCount,
-  inviteList,
-  inviteRead,
-  inviteRemove,
-  noticeCount,
-  noticeList,
-  noticeRead,
-  noticeRemove,
-} from "@/api/news.js";
-import website from "@/config/website.js";
-const size = 20;
-const handler = {
-  0: {
-    count: noticeCount,
-    getList: noticeList,
-    read: noticeRead,
-    remove: noticeRemove,
-  },
-  1: {
-    count: inviteCount,
-    getList: inviteList,
-    read: inviteRead,
-    remove: inviteRemove,
-  },
-};
-
-function getCount(data) {
-  let sum = 0;
-  for (let key in data) {
-    sum += data[key];
-  }
-  return sum;
-}
-
-let refreshTimer = null;
-
-function startRefreshToken(dispatch) {
-  refreshTimer = setInterval(() => {
-    dispatch("newsInit");
-  }, website.newsRefreshTime);
-}
-
-function stopRefreshToken() {
-  clearInterval(refreshTimer);
-}
-
-const news = {
-  state: {
-    count: 0,
-    data: {
-      0: {
-        id: "0",
-        title: "消息通知",
-        icon: "../../../static/img/notice.svg",
-        page: {
-          current: 0,
-          size,
-          total: size,
-        },
-        data: [],
-        prop: {
-          title: "title",
-          desc: (value) => {
-            if (value.data[0]) return value.data[0][0]["desc"];
-          },
-          time: "createTime",
-          isRead: "isRead",
-          listDesc: "desc",
-        },
-        navigateTo(item) {
-          uni.$once("getNewsDetail", (cb) => {
-            cb(item);
-          });
-          uni.navigateTo({
-            url: "/pages/news/newsDetail?type=0",
-          });
-        },
-      },
-      1: {
-        id: "1",
-        title: "任务申请",
-        icon: "../../../static/img/renwu.png",
-        page: {
-          current: 0,
-          size,
-          total: size,
-        },
-        data: [],
-        prop: {
-          title: "missionTitle",
-          desc: (value) => {
-            if (value.data[0])
-              return `您收到${value.data[0][0]["companyName"]}的任务`;
-          },
-          time: "createTime",
-          isRead: "status",
-          listDesc: "companyName",
-        },
-        navigateTo(item, dispatch) {
-          dispatch("readNew", {
-            key: "1",
-            id: item.id,
-          });
-          uni.navigateTo({
-            url: `/pages/projectInfo/projectInfo?type=1&missionNo=${encodeURIComponent(
-              item.missionNo
-            )}&id=${encodeURIComponent(item.id)}`,
-          });
-        },
-      },
-      2: {
-        id: "1",
-        title: "岗位申请",
-        icon: "../../../static/img/job_recruit.svg",
-        page: {
-          current: 0,
-          size,
-          total: size,
-        },
-        data: [],
-        prop: {
-          title: "missionTitle",
-          desc: (value) => {
-            if (value.data[0])
-              return `您收到${value.data[0][0]["companyName"]}的任务`;
-          },
-          time: "createTime",
-          isRead: "status",
-          listDesc: "companyName",
-        },
-        navigateTo(item, dispatch) {
-          dispatch("readNew", {
-            key: "1",
-            id: item.id,
-          });
-          uni.navigateTo({
-            url: `/pages/projectInfo/projectInfo?type=1&missionNo=${encodeURIComponent(
-              item.missionNo
-            )}&id=${encodeURIComponent(item.id)}`,
-          });
-        },
-      },
-      // "3": {
-      // 	id: "1",
-      // 	title: "技能推送",
-      // 	icon: "../../../static/img/jineng.svg",
-      // 	page: {
-      // 		current: 0,
-      // 		size,
-      // 		total: size
-      // 	},
-      // 	data: [],
-      // 	prop: {
-      // 		title: 'missionTitle',
-      // 		desc: (value) => {
-      // 			if (value.data[0])
-      // 				return `您收到${value.data[0][0]['companyName']}的任务`
-      // 		},
-      // 		time: 'createTime',
-      // 		isRead: 'status',
-      // 		listDesc: 'companyName',
-      // 	},
-      // 	navigateTo(item, dispatch) {
-      // 		dispatch('readNew', {
-      // 			key: '1',
-      // 			id: item.id
-      // 		})
-      // 		uni.navigateTo({
-      // 			url: `/pages/projectInfo/projectInfo?type=1&missionNo=${encodeURIComponent(item.missionNo)}&id=${encodeURIComponent(item.id)}`
-      // 		})
-      // 	}
-      // },
-      4: {
-        id: "1",
-        title: "个人户申请",
-        icon: "../../../static/img/own_recruit.svg",
-        page: {
-          current: 0,
-          size,
-          total: size,
-        },
-        data: [],
-        prop: {
-          title: "missionTitle",
-          desc: (value) => {
-            if (value.data[0])
-              return `您收到${value.data[0][0]["companyName"]}的任务`;
-          },
-          time: "createTime",
-          isRead: "status",
-          listDesc: "companyName",
-        },
-        navigateTo(item, dispatch) {
-          dispatch("readNew", {
-            key: "1",
-            id: item.id,
-          });
-          uni.navigateTo({
-            url: `/pages/projectInfo/projectInfo?type=1&missionNo=${encodeURIComponent(
-              item.missionNo
-            )}&id=${encodeURIComponent(item.id)}`,
-          });
-        },
-      },
-    },
-    unread: {
-      0: 0,
-      1: 0,
-    },
-    allUnread: 0,
-    dic: {},
-  },
-  actions: {
-    newsInit({ dispatch }) {
-      const ps = [];
-      ps.push(dispatch("getUnreadNum"));
-
-      for (let key in handler) {
-        ps.push(dispatch("newsReload", key));
-      }
-      return Promise.all(ps);
-    },
-    newsReload({ dispatch, commit }, id) {
-      commit("CLEAR_NEWS_DATA", id);
-      return dispatch("newsGetNextPage", id);
-    },
-    getUnreadNum({ commit }) {
-      for (let key in handler) {
-        handler[key].count().then((result) => {
-          commit("SET_UNREADNUM", {
-            id: key,
-            count: result,
-          });
-        });
-      }
-    },
-    newsGetNextPage({ state, commit }, id) {
-      const item = state.data[id];
-      const page = item.page;
-      const current = page.current + 1;
-      return new Promise((resolve, reject) => {
-        if (parseInt(page.total / page.size) + 1 < current) {
-          resolve();
-          return;
-        }
-        handler[id]
-          .getList(current, page.size)
-          .then((res) => {
-            const data = res.data.data;
-            commit("ADD_NEWS_DATA", {
-              id,
-              data: data.records,
-              current,
-              total: data.total,
-            });
-            resolve(res);
-          })
-          .catch(reject);
-      });
-    },
-    removeNew({ commit }, { id, key, group, index }) {
-      return new Promise((resolve, reject) => {
-        commit("REMOVE_NEWS", {
-          id,
-          key,
-          group,
-          index,
-        });
-        handler[key].remove(id).then(resolve, reject);
-      });
-    },
-    readNew({ commit }, { key, id }) {
-      return new Promise((resolve, reject) => {
-        commit("READ_NEWS", {
-          key,
-          id,
-        });
-        handler[key].read(id).then(resolve, reject);
-      });
-    },
-    endRefreshNewsTimer() {
-      stopRefreshToken();
-    },
-    startRefreshNewsTimer({ state, commit, dispatch }) {
-      dispatch("newsInit").then(() => {
-        startRefreshToken(dispatch);
-      });
-    },
-  },
-  mutations: {
-    SET_UNREADNUM: (state, { id, count }) => {
-      state.unread[id] = count;
-      state.allUnread = getCount(state.unread);
-    },
-    CLEAR_NEWS_DATA: (state, id) => {
-      state.data[id].page = {
-        current: 0,
-        size,
-      };
-      state.data[id].data = [];
-    },
-    ADD_NEWS_DATA: (state, { id, data, current, total }) => {
-      data.forEach((item) => {
-        state.dic[item.id] = item;
-      });
-      state.data[id].page.total = total;
-      state.data[id].page.current = current;
-      if (data.length > 0) {
-        state.data[id].data.push(data);
-      }
-    },
-    REMOVE_NEWS: (state, { id, key, group, index }) => {
-      const readProp = state.data[key].prop["isRead"];
-      if (state.dic[id][readProp] === 0) {
-        state.unread[key]--;
-        state.allUnread--;
-      }
-      state.dic[id] = undefined;
-      const data = state.data[key].data;
-      data[group].splice(index, 1);
-      if (data[group].length === 0) {
-        data.splice(group, 1);
-      }
-    },
-    READ_NEWS: (state, { key, id }) => {
-      const readProp = state.data[key].prop["isRead"];
-      if (state.dic[id][readProp] === 0) {
-        state.dic[id][readProp] = 1;
-        state.unread[key]--;
-        state.allUnread--;
-      }
-    },
-  },
-  getters: {},
-};
-export default news;
diff --git a/vue.config.js b/vue.config.js
index c0d8345..bb4d2d5 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -3,8 +3,8 @@ module.exports = {
         port: 1887,
         proxy: {
             '/api': {
-                // target: 'http://39.98.184.58:8000', // 公网
-                target: 'http://192.168.3.173:8000', // 本地服务接口地址
+                target: 'http://39.98.184.58:8000', // 公网
+                // target: 'http://192.168.3.173:8000', // 本地服务接口地址
                 ws: true,
                 pathRewrite: {
                     '^/api': '/'