From 417eb0e7d83118500e8c537b9ae4a6e05355c6af Mon Sep 17 00:00:00 2001
From: yangsanTT <812952667@qq.com>
Date: Tue, 1 Jun 2021 21:02:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B0=83=E8=AF=95=E7=94=A8=E6=88=B7=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Utils/Api.js                  |  3 +++
 pages/login/register.vue      | 17 +++++++-------
 pages/order/confirmation.vue  |  5 +++--
 pages/pay/payment/payment.vue |  3 +--
 pages/tabBar/home/home.vue    | 42 +++++++++++++++++++++++++++++++----
 5 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/Utils/Api.js b/Utils/Api.js
index a1cf68a..9b65321 100644
--- a/Utils/Api.js
+++ b/Utils/Api.js
@@ -151,6 +151,9 @@ export const bindUserPhone = params => {
 export const H5login = params => {
 	return POST('GET', `${base}/user/login`, params).then(res => res.data);
 }
+export const getH5AccessToken = params => {
+	return POSTBREST('GET', `${base}/wechat/getH5AccessToken`, params).then(res => res.data);
+}
 
 //**门店//
 export const userLogin = params => {
diff --git a/pages/login/register.vue b/pages/login/register.vue
index ec54a3c..0060a2c 100644
--- a/pages/login/register.vue
+++ b/pages/login/register.vue
@@ -24,7 +24,7 @@
 				<view @tap="toLogin">已有账号立即登录</view>
 			</view> -->
 
-			<image  v-if="Typeid == 1" @click="openWx" src='../../static/img/share/wx.png' class="wximg"></image>
+			<image v-if="Typeid == 1" @click="openWx" src='../../static/img/share/wx.png' class="wximg"></image>
 		</view>
 
 	</view>
@@ -145,9 +145,9 @@
 								key: "token",
 								data: res.return_data.uniqueCode
 							})
-							uni.reLaunch({
-								url: '/pages/tabBar/home/home'
-							});
+							location.href =
+								'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_base&state=1#wechat_redirect'
+
 						} else {
 							uni.showToast({
 								title: res.return_msg,
@@ -173,9 +173,7 @@
 								key: "token",
 								data: res.return_data.uniqueCode
 							})
-								uni.navigateBack({
-								})
-					
+							uni.navigateBack({})
 						} else {
 							uni.showToast({
 								title: res.return_msg,
@@ -189,7 +187,7 @@
 			//微信登录
 			openWx() {
 				location.href =
-					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_userinfo#wechat_redirect';
+					'https://open.weixin.qq.com/connect/oauth2/authorize?appid=wxa075e8509802f826&redirect_uri=https%3A%2F%2Fhsgcs.dctpay.com%2FH5%2Findex.html%23%2F&response_type=code&scope=snsapi_userinfo&state=2#wechat_redirect';
 			},
 			toLogin() {
 				uni.hideKeyboard()
@@ -204,7 +202,8 @@
 
 <style lang="scss">
 	@import "../../static/css/login.scss";
-	.wximg{
+
+	.wximg {
 		width: 50px;
 		height: 50px;
 		margin-left: 40%;
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 024a3de..583fa55 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -148,8 +148,8 @@
 				<button class="btn" v-else @tap="toPay">实际支付</button>
 				<!-- #endif -->
 				<!-- #ifdef H5 -->
-				<button class="btn" v-if="user.phone == null" @click="jumpH5Bding">实际..支付</button>
-				<button class="btn" v-else @tap="toPay">实际++支付</button>
+				<button class="btn" v-if="user.phone == null" @click="jumpH5Bding">实际支付</button>
+				<button class="btn" v-else @tap="toPay">实际支付</button>
 				<!-- #endif -->
 
 			</view>
@@ -205,6 +205,7 @@
 		},
 		onLoad(option) {
 			this.couponId = option.id;
+			this.user = app.globalData.userInfo;
 			this.getCouponById();
 			this.getUserNormalDiscountList();
 		},
diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue
index 76a9674..48cf372 100644
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@@ -120,8 +120,7 @@
 					}
 					orderToPay(params).then(res => {
 						if (res.return_code == '000000') {
-						
-							uni.pay
+							alert('=============================')
 							uni.requestPayment({
 								"appId": res.return_data.appId,
 								"nonceStr": res.return_data.nonceStr,
diff --git a/pages/tabBar/home/home.vue b/pages/tabBar/home/home.vue
index a697bfb..f87a715 100644
--- a/pages/tabBar/home/home.vue
+++ b/pages/tabBar/home/home.vue
@@ -114,7 +114,8 @@
 		HandleCode,
 		WXlogin,
 		getCouponList,
-		getH5UserInfo
+		getH5UserInfo,
+		getH5AccessToken
 	} from "../../../Utils/Api.js"; //您的api路径
 	let app = getApp();
 	export default {
@@ -174,17 +175,19 @@
 			// #ifdef H5
 			var arr1 = window.location.href;
 			var arr2 = arr1.split('=');
-			console.log(arr2);
-			if (!app.globalData.userInfo && arr2[1] != undefined) {
+			if (!app.globalData.userInfo && arr2[1] != undefined && arr2[2] == '2#/') {
 				this.getH5UserInfo(arr2[1]);
 			}
+		
+			if (app.globalData.userInfo && arr2[1] != undefined && arr2[2] == '1#/') {
+				this.getH5AccessToken(arr2[1]);
+			}
 			// #endif
 		},
 		onLoad() {
 			if (this.isWeiXinLogin()) {
 				//微信内核支付
 			}
-			
 
 			// 1.wx获取登录用户code
 			// #ifdef MP
@@ -219,6 +222,15 @@
 				},
 				fail: res => {}
 			})
+			// #ifdef H5
+			uni.getStorage({
+				key: "openId",
+				success(e) {
+					app.globalData.openId = e.data
+				},
+				fail: res => {}
+			})
+			// #endif
 
 		},
 		methods: {
@@ -258,6 +270,22 @@
 					}
 				})
 			},
+			//H5 获取openId
+			getH5AccessToken(item) {
+				let params = {
+					code: item
+				}
+				getH5AccessToken(params).then(res => {
+					if (res.return_code == '000000') {
+						app.globalData.openId = res.return_data.openid;
+						uni.setStorage({
+							key: "openId",
+							data: res.return_data.openid
+						})
+					}
+				});
+			},
+
 			//微信内核浏览器
 			isWeiXinLogin() {
 				var ua = navigator.userAgent.toLowerCase();
@@ -288,6 +316,12 @@
 							key: "token",
 							data: res.return_data.uniqueCode
 						})
+						uni.setStorage({
+							key: "openId",
+							data: res.return_data
+							.object
+							.highUser.openIdH5
+						})
 						app.globalData.openId = res.return_data
 							.object
 							.highUser.openIdH5;