From 1731f1849896e4bbea1cc094d25f29fe167f6a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Fri, 17 Mar 2023 11:34:01 +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

---
 pages/Personal/Personal.vue | 13 ++++++--
 store/index.js              | 63 ++++++++++++++++---------------------
 2 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/pages/Personal/Personal.vue b/pages/Personal/Personal.vue
index ed740d9..481b0fa 100644
--- a/pages/Personal/Personal.vue
+++ b/pages/Personal/Personal.vue
@@ -137,6 +137,9 @@
 	</view>
 </template>
 <script>
+	import {
+		mapActions
+	} from "vuex";
 	import {
 		appPersonal,
 	} from '@/api/Personal/Personal.js';
@@ -316,13 +319,17 @@
 				}
 			},
 			//积分页面
+			...mapActions(["integralopenPopup"]),
 			gointegral() {
 				const value = uni.getStorageSync('openid');
 				const value2 = uni.getStorageSync('patientId');
 				if (value && value2) {
-					uni.navigateTo({
-						url: `/pages/integral/integral?integral=${this.appPersonallist.integral}`
-					})
+					this.integralopenPopup();
+					setTimeout(e => {
+						uni.navigateTo({
+							url: `/pages/integral/integral?integral=${this.appPersonallist.integral}`
+						})
+					}, 0)
 				} else {
 					this.gologin();
 				}
diff --git a/store/index.js b/store/index.js
index 67b9f1e..c431573 100644
--- a/store/index.js
+++ b/store/index.js
@@ -18,55 +18,46 @@ const store = new Vuex.Store({
 				tmplIds: [
 					'-IxZeEkkXFhoSwGtBHbipKQ6kjEmkdTkswKeOypSsNQ',
 					'e1JRZaw1OfTz2b6X9DTqqaJtV4rXEt7uhwXoZLDb_eA',
-					'nUB9HRbqQXOVuTpkKBIHMgzWlNq6touzxf5QYBiMkbU'
+					'nUB9HRbqQXOVuTpkKBIHMgzWlNq6touzxf5QYBiMkbU',
 				],
-				success(res) {
-					var list = {
-						"subscribeMessageRecordList": [{
-								templateId: '-IxZeEkkXFhoSwGtBHbipKQ6kjEmkdTkswKeOypSsNQ',
-								subscribeStatus: res[
-									'-IxZeEkkXFhoSwGtBHbipKQ6kjEmkdTkswKeOypSsNQ'],
-								openid: openids,
-								patientId: patientIds,
-							},
-							{
-								templateId: 'e1JRZaw1OfTz2b6X9DTqqaJtV4rXEt7uhwXoZLDb_eA',
-								subscribeStatus: res[
-									'e1JRZaw1OfTz2b6X9DTqqaJtV4rXEt7uhwXoZLDb_eA'],
-								openid: openids,
-								patientId: patientIds,
-							},
-							{
-								templateId: 'nUB9HRbqQXOVuTpkKBIHMgzWlNq6touzxf5QYBiMkbU',
-								subscribeStatus: res[
-									'nUB9HRbqQXOVuTpkKBIHMgzWlNq6touzxf5QYBiMkbU'],
-								openid: openids,
-								patientId: patientIds,
-							},
-						]
-					}
-					if (openids && patientId) {
-						insertSubscribeMessageRecord(list).then(ress => {
-							console.log(ress)
-						})
-					}
-				},
-				fail(err) {
-					console.log(err)
-				},
+				success(res) {},
+				fail(err) {},
+				complete(scc) {}
+			})
+		},
+		integralsubscribesuccess(state) {
+			const openids = uni.getStorageSync('openid');
+			const patientIds = uni.getStorageSync('patientId');
+			wx.requestSubscribeMessage({
+				tmplIds: [
+					'S_c9bR4znSWpXg-6ACIMn7AkaR11dzo113XM8w4CKz0'
+				],
+				success(res) {},
+				fail(err) {},
 				complete(scc) {}
 			})
 		},
 	},
 	actions: {
 		//相当于异步的操作,不能直接改变state的值，只能通过触发mutations的方法才能改变
+		integralopenPopup(contxt) {
+			// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
+			wx.getSetting({
+				withSubscriptions: true, // 是否获取用户订阅消息的订阅状态，默认false不返回
+				success(res) {
+					if (res.authSetting['scope.subscribeMessage']) {} else {
+						//因为没有选择总是保持，所以需要调起授权弹窗再次授权
+						contxt.commit('integralsubscribesuccess')
+					}
+				}
+			})
+		},
 		// 是否设置过授权
 		openPopup(contxt) {
 			// 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
 			wx.getSetting({
 				withSubscriptions: true, // 是否获取用户订阅消息的订阅状态，默认false不返回
 				success(res) {
-					console.log('res.authSetting', res.authSetting)
 					if (res.authSetting['scope.subscribeMessage']) {} else {
 						//因为没有选择总是保持，所以需要调起授权弹窗再次授权
 						contxt.commit('subscribesuccess')