From fecc184e1a1f97be6da5090f238bbe7fa0c77062 Mon Sep 17 00:00:00 2001
From: wpf <2187978347@qq.com>
Date: Thu, 14 Mar 2024 11:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97=E5=8F=B7?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/payment/get_payment.vue | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pages/payment/get_payment.vue b/pages/payment/get_payment.vue
index 1cae073..cfa43f0 100644
--- a/pages/payment/get_payment.vue
+++ b/pages/payment/get_payment.vue
@@ -1,10 +1,11 @@
 <template>
 	<view class="container">
-		<view class="v-navbar">
+		<view v-if="!isWeixin" class="v-navbar">
 			<u-navbar title="提货付款" :safeAreaInsetTop="false" :fixed="false" @leftClick="leftClick" bgColor="transparent"
 				leftIconColor="#fff" :titleStyle="{color:'#fff',fontWeight:'bold',fontSize:'32rpx'}">
 			</u-navbar>
 		</view>
+    <view style="height: 150rpx;"></view>
 		<view v-if="merchantInfo && !isEmpty">
 			<view class="v-desc">
 				<view>
@@ -51,7 +52,7 @@
 			<image src="/static/images/no_thing.png"></image>
 			<text style="margin-top: 60rpx;">{{tips}}</text>
 			<!-- 登陆 -->
-			<authorize :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse"
+			<authorize v-show="!isWeixin" ref="authRef" :isAuto="isAuto" :isGoIndex="false" :isShowAuth="isShowAuth" @authColse="authColse"
 				@onLoadFun="onLoadFun">
 			</authorize>
 		</view>
@@ -80,6 +81,7 @@ import { Toast } from "../../libs/uniApi";
 		data() {
 			return {
 				isEmpty: false,
+        isWeixin: this.$wechat.isWeixin(),
 				cartForm: {
 					product_id: '',
 					product_attr_unique: '',
@@ -109,6 +111,12 @@ import { Toast } from "../../libs/uniApi";
 
 		onLoad(opt) {
 			this.mer_id = opt.mer_id;
+      if(this.isWeixin) {
+        this.tips = '加载中...';
+        this.$nextTick(()=>{
+          this.$refs.authRef.toWecahtAuth();
+        })
+      }
 		},
 		onShow() {
 			if (!this.isLogin) {
@@ -254,7 +262,7 @@ import { Toast } from "../../libs/uniApi";
 	}
 
 	.empty {
-		margin: 130rpx 0 150rpx;
+		margin: 0;
 		text-align: center;
 
 		image,