From 52871e23f63ebd4e1ee54088c53c01b7e0bbf97c Mon Sep 17 00:00:00 2001
From: yangjie <812952667@qq.com>
Date: Wed, 8 Sep 2021 11:37:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=AE=A2=E9=98=85=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/refuel-confirm/refuel-confirm.vue | 14 --------
 pages/tabBar/home/home.vue                    | 32 -------------------
 pages/userLogin/userLogin.vue                 | 18 +++++++++--
 3 files changed, 15 insertions(+), 49 deletions(-)

diff --git a/pages/goods/refuel-confirm/refuel-confirm.vue b/pages/goods/refuel-confirm/refuel-confirm.vue
index f926537..73a2085 100644
--- a/pages/goods/refuel-confirm/refuel-confirm.vue
+++ b/pages/goods/refuel-confirm/refuel-confirm.vue
@@ -219,20 +219,6 @@
 			//获取订单数据
 			orderToPay() {
 				let that = this;
-				uni.requestSubscribeMessage({
-				  tmplIds: ['oUvaCPeeOg4wH6HTvCcSabU6FnzXUXOBXsqBYAPOV-U'],
-				  success (res) {
-					
-				  },
-				  fail:(res) => {
-				  //    console.log(res)
-					 // uni.showToast({
-					 // 	title: '请开起消息订阅',
-						// duration:2000,
-						// icon:'none'
-					 // })
-				  }
-				})
 				if (that.paytype == '') {
 					uni.showToast({
 						title: '请选择支付方式',
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index e14a702..1983427 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -299,7 +299,6 @@
 		},
 		onLoad() {
 			let that = this;
-			// that.openMsg();
 			// 1.wx获取登录用户code
 			// #ifdef MP
 			uni.login({
@@ -345,37 +344,6 @@
 		},
 		methods: {
 			
-			// 开启订阅消息
-			openMsg() {
-			   uni.requestSubscribeMessage({
-			     tmplIds: ['oUvaCPeeOg4wH6HTvCcSabU6FnzXUXOBXsqBYAPOV-U'],
-			     success (res) {
-			        console.log(res)
-			     },
-			     fail:(res) => {
-			        console.log(res)
-			     }
-			   })
-				// var that = this
-			    // // 获取用户的当前设置，判断是否点击了“总是保持以上，不在询问”
-			    // wx.getSetting({
-			    //     withSubscriptions:true,  //是否获取用户订阅消息的订阅状态，默认false不返回
-			    //    success(res) {
-			    //       if(res.authSetting['scope.subscribeMessage'] || res.authSetting['scope.subscribeMessage'] == undefined) { //用户点击了“总是保持以上，不再询问”
-						 // uni.openSetting({ // 打开设置页
-			    //            success(res) {
-			    //              console.log(res.authSetting)
-			    //            },
-						 //   fail(err) {
-						 //   	console.log(err)
-						 //   }
-			    //          });
-			    //       }else { // 用户没有点击“总是保持以上，不再询问”则每次都会调起订阅消息
-			             
-			    //       }
-			    //    }
-			    // })
-			},
 			//获取弹出或者弹窗
 			getCmsContent() {
 				let params = {
diff --git a/pages/userLogin/userLogin.vue b/pages/userLogin/userLogin.vue
index 54f05b6..7729fe8 100644
--- a/pages/userLogin/userLogin.vue
+++ b/pages/userLogin/userLogin.vue
@@ -6,6 +6,8 @@
 			授权并登录</view>
 		<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="!user.phone && user"
 			open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">授权手机号</button>
+		<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16" v-if="user.phone && user"
+			@click="reqmessage">授权获取消息通知</button>
 		<!-- #endif -->
 		<!-- #ifdef H5 -->
 		<button class="mart30 width90 height50 fcorfff backcor008 fotct btns font16"
@@ -55,9 +57,7 @@
 									key: "token",
 									data: res.return_data.uniqueCode
 								})
-								if (res.return_data.object.highUser.phone) {
-									uni.navigateBack({})
-								}
+								if (res.return_data.object.highUser.phone) {}
 							} else {
 								uni.showToast({
 									title: res.return_msg
@@ -74,6 +74,18 @@
 				})
 				that.isShowAuth = false
 			},
+			//获取订阅号授权
+			reqmessage() {
+				uni.requestSubscribeMessage({
+					tmplIds: ['oUvaCPeeOg4wH6HTvCcSabU6FnzXUXOBXsqBYAPOV-U'],
+					success(res) {
+						uni.navigateBack({})
+					},
+					fail: (res) => {
+						uni.navigateBack({})
+					}
+				})
+			},
 			// 微信获取手机号
 			getPhoneNumber(PhoneNumber) {
 				let params = {