用户登录

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>

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: {

pages/user/index.vue

@@ -583,11 +583,7 @@
 					distribution_order: {},
 					goods_order: {},
 					service_order: {},
-<<<<<<< HEAD
-					recovery_order: {},
-=======
 					recovery_order: {}
->>>>>>> 3d7573ab8f399a5d4a34ad069a4bf251ff189104
 				},
 				actionCountsInfo: {},
 				userType: 2,