From 053a431fdb7478e2f601554a93b67ec628ab4188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Thu, 1 Feb 2024 08:53:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.js              |  2 +-
 pages/homepage/homepage.vue | 21 +++++++++++++++++----
 pagesC/wxSport/wxSport.vue  | 24 +++++++++++++++++++-----
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/api/request.js b/api/request.js
index ca8e28f..eb4718c 100644
--- a/api/request.js
+++ b/api/request.js
@@ -7,7 +7,7 @@ var request = function(config) {
 		if (config.url != '/nurseApplet/chatRecord/updateReadStatus' && config.url !=
 			"/nurseApplet/chatRecord/sendMessage" && config.url !=
 			`/applet/sign/apply/checkSignApply/` + uni.getStorageSync('userinfo').cardNo && urls !=
-			`/nurseApplet/chatRecord/getChatRecord`) {
+			`/nurseApplet/chatRecord/getChatRecord` && urls != '/applet/register/wxSportDecrypt') {
 			uni.showLoading({
 				title: ''
 			});
diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 5480bfd..72cfb70 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -108,6 +108,7 @@
 				address: '',
 				openid: '',
 				baseurl: '',
+				sportlist: [],
 			}
 		},
 		onLoad() {},
@@ -134,8 +135,15 @@
 				month >= 1 && month <= 9 ? (month = "0" + month) : "";
 				day >= 0 && day <= 9 ? (day = "0" + day) : "";
 				let time = `${year}-${month}-${day}`
-				let wxsportaddtime = uni.getStorageSync('wxsportaddtime');
-				if (wxsportaddtime != time) {
+				let identtime = `${this.userinfo.cardNo}${year}-${month}-${day}`
+				if (uni.getStorageSync('sportlist')) {
+					if (uni.getStorageSync('sportlist')[0].date != time) {
+						uni.removeStorageSync('sportlist');
+					} else {
+						this.sportlist = uni.getStorageSync('sportlist');
+					}
+				}
+				if (!this.sportlist.some(e => e.text == identtime)) {
 					wx.getSetting({
 						success: function(res) {
 							// 开启微信运动授权
@@ -164,10 +172,15 @@
 					iv: resp.iv
 				}
 				wxSportDecrypt(obj).then(Sportres => {
-					if (Sportres.data && Sportres.data[0].step >= 5000) {
+					if (Sportres.data && Sportres.data[0].step >= 100) {
 						wxsportadd(this.userinfo.cardNo).then(sportaddres => {
 							if (sportaddres.code == 200) {
-								uni.setStorageSync('wxsportaddtime', Sportres.data[0].date);
+								let sportitem = {
+									text: `${this.userinfo.cardNo}${Sportres.data[0].date}`,
+									date: Sportres.data[0].date
+								}
+								this.sportlist.unshift(sportitem)
+								uni.setStorageSync('sportlist', this.sportlist);
 							}
 						})
 					}
diff --git a/pagesC/wxSport/wxSport.vue b/pagesC/wxSport/wxSport.vue
index 36a497d..de3d2eb 100644
--- a/pagesC/wxSport/wxSport.vue
+++ b/pagesC/wxSport/wxSport.vue
@@ -29,6 +29,7 @@
 			return {
 				list: undefined,
 				userinfo: undefined,
+				sportlist: [],
 			};
 		},
 		onShow() {
@@ -44,7 +45,14 @@
 				month >= 1 && month <= 9 ? (month = "0" + month) : "";
 				day >= 0 && day <= 9 ? (day = "0" + day) : "";
 				let time = `${year}-${month}-${day}`
-				let wxsportaddtime = uni.getStorageSync('wxsportaddtime');
+				let identtime = `${this.userinfo.cardNo}${year}-${month}-${day}`
+				if (uni.getStorageSync('sportlist')) {
+					if (uni.getStorageSync('sportlist')[0].date != time) {
+						uni.removeStorageSync('sportlist');
+					} else {
+						this.sportlist = uni.getStorageSync('sportlist');
+					}
+				}
 				let obj = {
 					code: res.code,
 					encryptedData: resp.encryptedData,
@@ -52,11 +60,16 @@
 				}
 				wxSportDecrypt(obj).then(Sportres => {
 					this.list = Sportres.data
-					if (wxsportaddtime != time) {
-						if (Sportres.data && Sportres.data[0].step >= 5000) {
+					if (!this.sportlist.some(e => e.text == identtime)) {
+						if (Sportres.data && Sportres.data[0].step >= 100) {
 							wxsportadd(this.userinfo.cardNo).then(sportaddres => {
 								if (sportaddres.code == 200) {
-									uni.setStorageSync('wxsportaddtime', Sportres.data[0].date);
+									let sportitem = {
+										text: `${this.userinfo.cardNo}${Sportres.data[0].date}`,
+										date: Sportres.data[0].date
+									}
+									this.sportlist.unshift(sportitem)
+									uni.setStorageSync('sportlist', this.sportlist);
 								}
 							})
 						}
@@ -87,7 +100,8 @@
 									if (loginres.code) {
 										wx.getWeRunData({
 											success: function(WeRunDatares) {
-												that.wxSport(loginres, WeRunDatares)
+												that.wxSport(loginres,
+													WeRunDatares)
 											}
 										});
 									}