From 7fc82a629578d0e7d6a4fabf7ca43cb6c8b79b74 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Sat, 23 Mar 2024 11:03:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libs/login.js                 | 19 ++++++++++---------
 pages/payment/get_payment.vue |  5 +++++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/libs/login.js b/libs/login.js
index d1dc270..01fdb25 100644
--- a/libs/login.js
+++ b/libs/login.js
@@ -51,15 +51,16 @@ export function toLogin(push, pathLogin) {
     Cache.set('login_back_url', path);
 	// #ifdef H5
 	if (isWeixin()) {
-		if (Cache.get('WECHAT_APPID')) {
-			uni.navigateTo({
-				url: '/pages/users/wechat_login/index',
-			});
-		} else {
-			return uni.navigateTo({
-				url: '/pages/users/login/login_copy'
-			})
-		}
+    auth.oAuth();
+		// if (Cache.get('WECHAT_APPID')) {
+		// 	uni.navigateTo({
+		// 		url: '/pages/users/wechat_login/index',
+		// 	});
+		// } else {
+		// 	return uni.navigateTo({
+		// 		url: '/pages/users/login/login_copy'
+		// 	})
+		// }
 	} else {
 		if (path !== pathLogin) {
 			push ? uni.navigateTo({
diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 8a36544..b257649 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -1,10 +1,15 @@
 <template>
 	<view class="container">
+		<!-- #ifdef APP-PLUS -->
 		<view v-if="!isWeixin" class="v-navbar">
 			<u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
 				leftIconColor="#333" :titleStyle="{color:'#333',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
+		<!-- #endif -->
+    <!-- #ifdef H5 -->
+    <view style="height: 100rpx;"></view>
+    <!-- #endif -->
 		<view style="height: 50rpx;"></view>
 		<view class="wrap">
 			<view class="shop">