From f905d9e2b85f66b790caf0c6229260acbfe11836 Mon Sep 17 00:00:00 2001
From: shuxiaoquan <853623962@qq.com>
Date: Tue, 27 Feb 2024 14:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/components/mp-weixin-mobile.vue | 3 +--
 pages/login/index.vue                       | 6 +++++-
 pages/user/index.vue                        | 4 ----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pages/login/components/mp-weixin-mobile.vue b/pages/login/components/mp-weixin-mobile.vue
index 401fab9..7794785 100644
--- a/pages/login/components/mp-weixin-mobile.vue
+++ b/pages/login/components/mp-weixin-mobile.vue
@@ -3,8 +3,7 @@
 	<view class="wechat-auth">
 		<button class="btn-normal" open-type="getPhoneNumber" @getphonenumber="handelMpWeixinMobileLogin($event)">
 			<view class="wechat-auth-container">
-				<image class="icon" src="../../../static/channel/wechat.png"></image>
-				<text class="title">微信手机号一键登录</text>
+				<text class="title">手机号快捷登录</text>
 			</view>
 		</button>
 	</view>
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 1e2b648..cd0255a 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -19,7 +19,10 @@
 			</view>
 		</view>
 		<view class="login-fd login-fd-on" @click="login">登录</view>
-		<view class="">
+		<view class="" v-if="isCheckout">
+			<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
+		</view>
+		<view class="" v-else>
 			<mpWeiXinMobile :refereeId="refereeId"></mpWeiXinMobile>
 		</view>
 	</view>
@@ -40,6 +43,7 @@
 		},
 		data() {
 			return {
+				isCheckout: false,
 				showCountDown: false,
 				currentIndex: 0,
 				background: {
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 4532ebd..d5407a3 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -583,11 +583,7 @@
 					distribution_order: {},
 					goods_order: {},
 					service_order: {},
-<<<<<<< HEAD
-					recovery_order: {},
-=======
 					recovery_order: {}
->>>>>>> 3d7573ab8f399a5d4a34ad069a4bf251ff189104
 				},
 				actionCountsInfo: {},
 				userType: 2,