机构的消息队列，前段代码完成，等待后端调试

pages.json

@@ -83,7 +83,8 @@
 		{
 			"path": "pages/index/index",
 			"style": {
-				"navigationBarTitleText": "首页"
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true
 			}
 		},
 		{

pages/addjigou/api/addjigou.js

@@ -39,3 +39,10 @@ export function getrel(id){
 		method: 'get',
     })
 }
+//检测有没有已读
+export function isRead(openId){
+    return request({
+        url: `/api/wx/notice/unreadCount?openId=${uni.getStorageSync('openid')}&clientType=1`,
+		method: 'get',
+    })
+}

pages/index/index.vue

@@ -269,11 +269,16 @@
 		onUnmounted
 	} from 'vue';
 	import {
-		onLoad
+		onLoad,
+		onShow,
+		onPullDownRefresh
 	} from '@dcloudio/uni-app';
+
 	import {
-		getMessageList
+		getMessageList,
+		isRead
 	} from '@/pages/addjigou/api/addjigou.js'
+
 	// import tu from 'https://www.focusnu.com/media/directive/index/tu.png'
 	import request from '@/request/index.js' // 您封装的 uni.request
 	import downMenu from '@/compontent/public/downmenu.vue'
@@ -285,7 +290,10 @@
 	const hong = ref(0);
 	// const itemArray = ["NU", "动态", "我的"];
 	const buttonArray = ref(["办公室", "员工", "机构维护"])
-	const imgArray = ref(['https://www.focusnu.com/media/directive/index/jigouindex/bangong.png','https://www.focusnu.com/media/directive/index/jigouindex/yuangong.png','https://www.focusnu.com/media/directive/index/jigouindex/weihu.png'])
+	const imgArray = ref(['https://www.focusnu.com/media/directive/index/jigouindex/bangong.png',
+		'https://www.focusnu.com/media/directive/index/jigouindex/yuangong.png',
+		'https://www.focusnu.com/media/directive/index/jigouindex/weihu.png'
+	])
 	const statusarray = ["loading", "success", "fail"]
 	// const itemTarget = ref(0);
 	const which = ref(0);
@@ -474,8 +482,22 @@
 			}
 		});
 	}
-	onLoad(() => {
+	onShow(() => {
-		loadingData()
+		loadingData();
+		isRead().then(res => {
+			if (res.result) {
+				hong.value = res.result;
+			}
+		})
+	})
+	onPullDownRefresh(() => {
+		loadingData();
+		isRead().then(res => {
+			if (res.result) {
+				hong.value = res.result;
+			}
+		})
+		uni.stopPullDownRefresh()
 	})
 </script>
 
@@ -1003,6 +1025,7 @@
 			}
 		}
 	}
+
 	.small-ball {
 		position: fixed;
 		right: 120px;

pages/oldmanindex/index.vue

@@ -432,7 +432,7 @@
 	}
 	const clickSmallball = () => {
 		// uni.getStorageSync('token')
-		uni.setStorageSync('jumpIndex', 0);
+		uni.setStorageSync('jumpIndex', 3);
 		uni.navigateTo({
 			url: "/pages/oldmanindex/message"
 		})

pages/yuangongindex/api.js

@@ -56,12 +56,11 @@ export function getId(id){
 		method: 'get',
     })
 }
-//机构邀请
+//消息队列
-export function getNotice(openId){
+export function getNotice(){
     return request({
-        url: `/api/wx/notice/query?openId=${uni.getStorageSync('openid')}&clientType=2`,
+        url: `/api/wx/notice/query?openId=${uni.getStorageSync('openid')}&clientType=${uni.getStorageSync('jumpIndex')}`,
 		method: 'get',
-		// data: JSON.stringify({ openId: uni.getStorageSync('openid') }) // 把 body 串行化，强行放 data
     })
 }
 

pages/yuangongindex/index.vue

@@ -290,7 +290,7 @@
 
 	const clickSmallball = () => {
 
-		uni.setStorageSync('jumpIndex', 1);
+		uni.setStorageSync('jumpIndex', 2);
 		uni.navigateTo({
 			url: "/pages/yuangongindex/message"
 		})

pages/yuangongindex/message.vue

@@ -122,16 +122,18 @@
 		}
 
 	}
+	const jumpIndex = ref(uni.getStorageSync('jumpIndex'));
 	const goBack = () => {
-		// uni.navigateBack();
+		console.log("?????",jumpIndex.value)
-		if (uni.getStorageSync('jumpIndex')) {
+		switch (jumpIndex.value) {
-			uni.reLaunch({
+			case 1:
-				url: '/pages/yuangongindex/index'
+				uni.reLaunch({ url: '/pages/index/index' });
-			})
+				break;
-		} else {
+			case 2:
-			uni.reLaunch({
+				uni.reLaunch({ url: '/pages/yuangongindex/index' });
-				url: '/pages/oldmanindex/index'
+				break;
-			})
+			case 3:
+				uni.reLaunch({ url: '/pages/oldmanindex/index' });
 		}
 
 

unpackage/dist/dev/.sourcemap/mp-weixin/pages/addjigou/api/addjigou.js.map

@@ -1 +1 @@
-{"version":3,"file":"addjigou.js","sources":["pages/addjigou/api/addjigou.js"],"sourcesContent":["// src/composables/useWeChatAuth.js\nimport { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//新增/编辑机构加盟申请信息\r\nexport function changemessage(data,ukey){\r\n    return request({\r\n        url: `/api/orgApplyInfo/save?ukey=${ukey}`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n\r\n//根据手机号获取机构加盟申请信息\r\nexport function getMessageList(id){\r\n    return request({\r\n        url: `/api/orgApplyInfo/queryAuditInfo?openId=${id}&status=1,2,3`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\nexport function getMessageListsuccess(id){\r\n    return request({\r\n        url: `/api/orgApplyInfo/queryAuditInfo?status=0,2,4,5&openId=${id}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//获取省市区\r\nexport function getdate(id){\n    return request({\n        url: `/api/common/queryAreaDict?id=${id}`,\n\t\tmethod: 'get',\n    })\n}\r\n\r\n//将地址id转换成汉字\r\nexport function getrel(id){\n    return request({\n        url: `/api/common/queryAreaNameById?id=${id}`,\n\t\tmethod: 'get',\n    })\n}"],"names":["request"],"mappings":";;;AAKO,SAAS,cAAc,MAAK,MAAK;AACpC,SAAOA,sBAAQ;AAAA,IACX,KAAK,+BAA+B,IAAI;AAAA,IAC9C,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAGO,SAAS,eAAe,IAAG;AAC9B,SAAOA,sBAAQ;AAAA,IACX,KAAK,2CAA2C,EAAE;AAAA,IACxD,QAAQ;AAAA,EACV,CAAK;AACL;AACO,SAAS,sBAAsB,IAAG;AACrC,SAAOA,sBAAQ;AAAA,IACX,KAAK,0DAA0D,EAAE;AAAA,IACvE,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,QAAQ,IAAG;AACvB,SAAOA,sBAAQ;AAAA,IACX,KAAK,gCAAgC,EAAE;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAK;AACL;;;;;"}
+{"version":3,"file":"addjigou.js","sources":["pages/addjigou/api/addjigou.js"],"sourcesContent":["// src/composables/useWeChatAuth.js\nimport { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//新增/编辑机构加盟申请信息\r\nexport function changemessage(data,ukey){\r\n    return request({\r\n        url: `/api/orgApplyInfo/save?ukey=${ukey}`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n\r\n//根据手机号获取机构加盟申请信息\r\nexport function getMessageList(id){\r\n    return request({\r\n        url: `/api/orgApplyInfo/queryAuditInfo?openId=${id}&status=1,2,3`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\nexport function getMessageListsuccess(id){\r\n    return request({\r\n        url: `/api/orgApplyInfo/queryAuditInfo?status=0,2,4,5&openId=${id}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//获取省市区\r\nexport function getdate(id){\n    return request({\n        url: `/api/common/queryAreaDict?id=${id}`,\n\t\tmethod: 'get',\n    })\n}\r\n\r\n//将地址id转换成汉字\r\nexport function getrel(id){\n    return request({\n        url: `/api/common/queryAreaNameById?id=${id}`,\n\t\tmethod: 'get',\n    })\n}\r\n//检测有没有已读\r\nexport function isRead(openId){\r\n    return request({\r\n        url: `/api/wx/notice/unreadCount?openId=${uni.getStorageSync('openid')}&clientType=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}"],"names":["request","uni"],"mappings":";;;AAKO,SAAS,cAAc,MAAK,MAAK;AACpC,SAAOA,sBAAQ;AAAA,IACX,KAAK,+BAA+B,IAAI;AAAA,IAC9C,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAGO,SAAS,eAAe,IAAG;AAC9B,SAAOA,sBAAQ;AAAA,IACX,KAAK,2CAA2C,EAAE;AAAA,IACxD,QAAQ;AAAA,EACV,CAAK;AACL;AACO,SAAS,sBAAsB,IAAG;AACrC,SAAOA,sBAAQ;AAAA,IACX,KAAK,0DAA0D,EAAE;AAAA,IACvE,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,QAAQ,IAAG;AACvB,SAAOA,sBAAQ;AAAA,IACX,KAAK,gCAAgC,EAAE;AAAA,IAC7C,QAAQ;AAAA,EACV,CAAK;AACL;AAUO,SAAS,OAAO,QAAO;AAC1B,SAAOA,sBAAQ;AAAA,IACX,KAAK,qCAAqCC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC5E,QAAQ;AAAA,EACV,CAAK;AACL;;;;;;"}

unpackage/dist/dev/.sourcemap/mp-weixin/pages/yuangongindex/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sources":["pages/yuangongindex/api.js"],"sourcesContent":["// src/composables/useWeChatAuth.js\nimport { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//向机构申请\r\nexport function Apply(data){\r\n    return request({\r\n        url: `/api/employessapply/apply`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//向机构接受拒绝\r\nexport function invitedConfirm(data){\r\n    return request({\r\n        url: `/api/employessapply/invitedConfirm`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//获取机构的列表\r\nexport function getOrgInfo(title){\r\n    return request({\r\n        url: `/api/employessapply/getOrgInfo?title=${title}&pageSize=-1&openId=${uni.getStorageSync('openid')}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//获取审核的列表\r\nexport function getEmployeesOrgRela(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0,1,2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//主页\r\nexport function getIndex(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//机构邀请\r\nexport function getInvited(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//单独机构邀请\r\nexport function getId(id){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${uni.getStorageSync('openid')}&invited=0&id=${id}&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//机构邀请\r\nexport function getNotice(openId){\r\n    return request({\r\n        url: `/api/wx/notice/query?openId=${uni.getStorageSync('openid')}&clientType=2`,\r\n\t\tmethod: 'get',\r\n\t\t// data: JSON.stringify({ openId: uni.getStorageSync('openid') }) // 把 body 串行化，强行放 data\r\n    })\r\n}\r\n\r\n//检测有没有已读\r\nexport function isRead(openId){\r\n    return request({\r\n        url: `/api/wx/notice/unreadCount?openId=${uni.getStorageSync('openid')}&clientType=2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n \r\n//向机构申请\r\nexport function upRead(data){\r\n    return request({\r\n        url: `/api/wx/notice/upRead`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n} "],"names":["request","uni"],"mappings":";;;AAKO,SAAS,MAAM,MAAK;AACvB,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,eAAe,MAAK;AAChC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,WAAW,OAAM;AAC7B,SAAOA,sBAAQ;AAAA,IACX,KAAK,wCAAwC,KAAK,uBAAuBC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC3G,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,oBAAoB,QAAO;AACvC,SAAOD,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,SAAS,QAAO;AAC5B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,WAAW,QAAO;AAC9B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,MAAM,IAAG;AACrB,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkDC,oBAAI,eAAe,QAAQ,CAAC,iBAAiB,EAAE;AAAA,IAC5G,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,UAAU,QAAO;AAC7B,SAAOD,sBAAQ;AAAA,IACX,KAAK,+BAA+BC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IACtE,QAAQ;AAAA;AAAA,EAEV,CAAK;AACL;AAGO,SAAS,OAAO,QAAO;AAC1B,SAAOD,sBAAQ;AAAA,IACX,KAAK,qCAAqCC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC5E,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,OAAO,MAAK;AACxB,SAAOD,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;;;;;;;;;;;"}
+{"version":3,"file":"api.js","sources":["pages/yuangongindex/api.js"],"sourcesContent":["// src/composables/useWeChatAuth.js\nimport { ref } from 'vue';\nimport request from '@/request/index.js';\r\n\r\n//向机构申请\r\nexport function Apply(data){\r\n    return request({\r\n        url: `/api/employessapply/apply`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//向机构接受拒绝\r\nexport function invitedConfirm(data){\r\n    return request({\r\n        url: `/api/employessapply/invitedConfirm`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n}\r\n//获取机构的列表\r\nexport function getOrgInfo(title){\r\n    return request({\r\n        url: `/api/employessapply/getOrgInfo?title=${title}&pageSize=-1&openId=${uni.getStorageSync('openid')}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//获取审核的列表\r\nexport function getEmployeesOrgRela(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0,1,2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//主页\r\nexport function getIndex(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//机构邀请\r\nexport function getInvited(openId){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${openId}&invited=0&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//单独机构邀请\r\nexport function getId(id){\r\n    return request({\r\n        url: `/api/employessapply/getEmployeesOrgRela?openId=${uni.getStorageSync('openid')}&invited=0&id=${id}&izHistory=1`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n//消息队列\r\nexport function getNotice(){\r\n    return request({\r\n        url: `/api/wx/notice/query?openId=${uni.getStorageSync('openid')}&clientType=${uni.getStorageSync('jumpIndex')}`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n\r\n//检测有没有已读\r\nexport function isRead(openId){\r\n    return request({\r\n        url: `/api/wx/notice/unreadCount?openId=${uni.getStorageSync('openid')}&clientType=2`,\r\n\t\tmethod: 'get',\r\n    })\r\n}\r\n \r\n//向机构申请\r\nexport function upRead(data){\r\n    return request({\r\n        url: `/api/wx/notice/upRead`,\r\n\t\tmethod: 'post',\r\n        data,\r\n    })\r\n} "],"names":["request","uni"],"mappings":";;;AAKO,SAAS,MAAM,MAAK;AACvB,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,eAAe,MAAK;AAChC,SAAOA,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;AAEO,SAAS,WAAW,OAAM;AAC7B,SAAOA,sBAAQ;AAAA,IACX,KAAK,wCAAwC,KAAK,uBAAuBC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC3G,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,oBAAoB,QAAO;AACvC,SAAOD,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,SAAS,QAAO;AAC5B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,WAAW,QAAO;AAC9B,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkD,MAAM;AAAA,IACnE,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,MAAM,IAAG;AACrB,SAAOA,sBAAQ;AAAA,IACX,KAAK,kDAAkDC,oBAAI,eAAe,QAAQ,CAAC,iBAAiB,EAAE;AAAA,IAC5G,QAAQ;AAAA,EACV,CAAK;AACL;AAEO,SAAS,YAAW;AACvB,SAAOD,sBAAQ;AAAA,IACX,KAAK,+BAA+BC,cAAG,MAAC,eAAe,QAAQ,CAAC,eAAeA,cAAG,MAAC,eAAe,WAAW,CAAC;AAAA,IACpH,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,OAAO,QAAO;AAC1B,SAAOD,sBAAQ;AAAA,IACX,KAAK,qCAAqCC,cAAAA,MAAI,eAAe,QAAQ,CAAC;AAAA,IAC5E,QAAQ;AAAA,EACV,CAAK;AACL;AAGO,SAAS,OAAO,MAAK;AACxB,SAAOD,sBAAQ;AAAA,IACX,KAAK;AAAA,IACX,QAAQ;AAAA,IACF;AAAA,EACR,CAAK;AACL;;;;;;;;;;;"}

unpackage/dist/dev/mp-weixin/pages/addjigou/api/addjigou.js

@@ -1,5 +1,5 @@
 "use strict";
-require("../../../common/vendor.js");
+const common_vendor = require("../../../common/vendor.js");
 const request_index = require("../../../request/index.js");
 function changemessage(data, ukey) {
   return request_index.request({
@@ -26,8 +26,15 @@ function getdate(id) {
     method: "get"
   });
 }
+function isRead(openId) {
+  return request_index.request({
+    url: `/api/wx/notice/unreadCount?openId=${common_vendor.index.getStorageSync("openid")}&clientType=1`,
+    method: "get"
+  });
+}
 exports.changemessage = changemessage;
 exports.getMessageList = getMessageList;
 exports.getMessageListsuccess = getMessageListsuccess;
 exports.getdate = getdate;
+exports.isRead = isRead;
 //# sourceMappingURL=../../../../.sourcemap/mp-weixin/pages/addjigou/api/addjigou.js.map

unpackage/dist/dev/mp-weixin/pages/index/index.js

@@ -13,7 +13,11 @@ const _sfc_main = {
     const content = common_vendor.ref("");
     const hong = common_vendor.ref(0);
     const buttonArray = common_vendor.ref(["办公室", "员工", "机构维护"]);
-    const imgArray = common_vendor.ref(["https://www.focusnu.com/media/directive/index/jigouindex/bangong.png", "https://www.focusnu.com/media/directive/index/jigouindex/yuangong.png", "https://www.focusnu.com/media/directive/index/jigouindex/weihu.png"]);
+    const imgArray = common_vendor.ref([
+      "https://www.focusnu.com/media/directive/index/jigouindex/bangong.png",
+      "https://www.focusnu.com/media/directive/index/jigouindex/yuangong.png",
+      "https://www.focusnu.com/media/directive/index/jigouindex/weihu.png"
+    ]);
     const statusarray = ["loading", "success", "fail"];
     const which = common_vendor.ref(0);
     const ceshi = () => {
@@ -52,7 +56,7 @@ const _sfc_main = {
       }
     };
     const again = (item) => {
-      common_vendor.index.__f__("log", "at pages/index/index.vue:342", "????", item);
+      common_vendor.index.__f__("log", "at pages/index/index.vue:350", "????", item);
       common_vendor.index.setStorageSync("baddata", item);
       common_vendor.index.setStorageSync("specicalid", item.id);
       common_vendor.index.setStorageSync("backhuancun", {});
@@ -94,8 +98,22 @@ const _sfc_main = {
         }
       });
     };
-    common_vendor.onLoad(() => {
+    common_vendor.onShow(() => {
       loadingData();
+      pages_addjigou_api_addjigou.isRead().then((res) => {
+        if (res.result) {
+          hong.value = res.result;
+        }
+      });
+    });
+    common_vendor.onPullDownRefresh(() => {
+      loadingData();
+      pages_addjigou_api_addjigou.isRead().then((res) => {
+        if (res.result) {
+          hong.value = res.result;
+        }
+      });
+      common_vendor.index.stopPullDownRefresh();
     });
     return (_ctx, _cache) => {
       var _a;

unpackage/dist/dev/mp-weixin/pages/index/index.json

@@ -1,5 +1,6 @@
 {
   "navigationBarTitleText": "首页",
+  "enablePullDownRefresh": true,
   "usingComponents": {
     "down-menu": "../../compontent/public/downmenu",
     "model": "../../compontent/public/model"

unpackage/dist/dev/mp-weixin/pages/oldmanindex/index.js

@@ -111,7 +111,7 @@ const _sfc_main = {
       });
     };
     const clickSmallball = () => {
-      common_vendor.index.setStorageSync("jumpIndex", 0);
+      common_vendor.index.setStorageSync("jumpIndex", 3);
       common_vendor.index.navigateTo({
         url: "/pages/oldmanindex/message"
       });

unpackage/dist/dev/mp-weixin/pages/yuangongindex/api.js

@@ -45,11 +45,10 @@ function getId(id) {
     method: "get"
   });
 }
-function getNotice(openId) {
+function getNotice() {
   return request_index.request({
-    url: `/api/wx/notice/query?openId=${common_vendor.index.getStorageSync("openid")}&clientType=2`,
+    url: `/api/wx/notice/query?openId=${common_vendor.index.getStorageSync("openid")}&clientType=${common_vendor.index.getStorageSync("jumpIndex")}`,
     method: "get"
-    // data: JSON.stringify({ openId: uni.getStorageSync('openid') }) // 把 body 串行化，强行放 data
   });
 }
 function isRead(openId) {

unpackage/dist/dev/mp-weixin/pages/yuangongindex/index.js

@@ -18,7 +18,7 @@ const _sfc_main = {
     const statusarray = ["loading", "success", "fail"];
     const which = common_vendor.ref(0);
     const clickSmallball = () => {
-      common_vendor.index.setStorageSync("jumpIndex", 1);
+      common_vendor.index.setStorageSync("jumpIndex", 2);
       common_vendor.index.navigateTo({
         url: "/pages/yuangongindex/message"
       });

unpackage/dist/dev/mp-weixin/pages/yuangongindex/message.js

@@ -23,15 +23,18 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
         hong.value = true;
       }
     };
+    const jumpIndex = common_vendor.ref(common_vendor.index.getStorageSync("jumpIndex"));
     const goBack = () => {
-      if (common_vendor.index.getStorageSync("jumpIndex")) {
+      common_vendor.index.__f__("log", "at pages/yuangongindex/message.vue:127", "?????", jumpIndex.value);
-        common_vendor.index.reLaunch({
+      switch (jumpIndex.value) {
-          url: "/pages/yuangongindex/index"
+        case 1:
-        });
+          common_vendor.index.reLaunch({ url: "/pages/index/index" });
-      } else {
+          break;
-        common_vendor.index.reLaunch({
+        case 2:
-          url: "/pages/oldmanindex/index"
+          common_vendor.index.reLaunch({ url: "/pages/yuangongindex/index" });
-        });
+          break;
+        case 3:
+          common_vendor.index.reLaunch({ url: "/pages/oldmanindex/index" });
       }
     };
     const search = () => {