login小bug

pages/index/fugou.vue

@@ -49,6 +49,13 @@
 						</view>
 						<label class="radio1" @click="changePayType(1)"><radio style="transform:scale(0.7)" value="" :checked="payType == 1" color="#5dbc7c"></radio></label>
 					</view>
+					<view class="paybox-main flex">
+						<view class="zftype flex">
+							<image src="../../static/img/weixin.png" mode="aspectFill"></image>
+							<view class="zf">支付宝支付</view>
+						</view>
+						<label class="radio1" @click="changePayType(4)"><radio style="transform:scale(0.7)" value="" :checked="payType == 4" color="#5dbc7c"></radio></label>
+					</view>
 					<view class="paybox-main flex">
 						<view class="zftype flex">
 							<image src="../../static/img/yue.png" mode="aspectFill"></image>
@@ -184,7 +191,11 @@ export default {
 			}
 			if (this.payType == 3) {
 				this.payName = 'brokerage';
-				console.log('yue', this.payName);
+				console.log('brokerage', this.payName);
+			}
+			if (this.payType == 4) {
+				this.payName = 'ali';
+				console.log('ali', this.payName);
 			}
 		},
 		// 提交订单
@@ -196,28 +207,28 @@ export default {
 			try {
 				let obj = this;
 				// 判断是否余额不足
-				if (obj.payName == 'yue' && +obj.now_money < obj.payAllMoney) {
-					uni.showModal({
-						title: '提示',
-						content: '账户余额不足！',
-						showCancel: false,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-					return;
-				}
-				if (obj.payName == 'yue' && +obj.now_money < obj.payAllMoney) {
-					uni.showModal({
-						title: '提示',
-						content: '账户余额不足！',
-						showCancel: false,
-						success: res => {},
-						fail: () => {},
-						complete: () => {}
-					});
-					return;
-				}
+				// if (obj.payName == 'yue' && +obj.now_money < obj.payAllMoney) {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '账户余额不足！',
+				// 		showCancel: false,
+				// 		success: res => {},
+				// 		fail: () => {},
+				// 		complete: () => {}
+				// 	});
+				// 	return;
+				// }
+				// if (obj.payName == 'yue' && +obj.now_money < obj.payAllMoney) {
+				// 	uni.showModal({
+				// 		title: '提示',
+				// 		content: '账户余额不足！',
+				// 		showCancel: false,
+				// 		success: res => {},
+				// 		fail: () => {},
+				// 		complete: () => {}
+				// 	});
+				// 	return;
+				// }
 				// 支付中
 				obj.payLoding = true;
 				// #ifdef H5

pages/public/login.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="container">
 		<view class="container_text">
-<<<<<<< HEAD
+
 			<image class="banner-img" src="/static/img/login.png" mode="scaleToFill">
-=======
+
 			<image class="banner-img" src="/static/img/logo.png" mode="scaleToFill">
->>>>>>> 9120b76f6c258133d586d998575baec28e13fae4
+
 		</image>
 		</view>
 		<view class="loginTitle"><text>登录</text></view>
@@ -27,13 +27,7 @@
 				<view class="fenge"></view>
 			</view> -->
 			<!-- #ifndef APP-PLUS -->
-<<<<<<< HEAD
-			<view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
-			<!-- <view class="weixin_text" @click="wecahtLogin">微信登录</view> -->
-=======
-			<!-- <view class="weixin" @click="wecahtLogin"><image src="/static/img/img05.png"></image></view>
-			<view class="weixin_text" @click="wecahtLogin">微信登录</view> -->
->>>>>>> 9120b76f6c258133d586d998575baec28e13fae4
+
 			<!-- #endif -->
 			<!-- #ifdef APP-PLUS -->
 			<!-- <block v-if="!is_ios">
@@ -303,20 +297,15 @@ page {
 	width: 100%;
 	height: 500rpx;
 	top: 0rpx;
-<<<<<<< HEAD
-	
-=======
-	// background-color: #6EAB4E;
->>>>>>> 9120b76f6c258133d586d998575baec28e13fae4
 	.banner-img {
 		width: 100%;
 		height: 100%;
 	}
 }
 .login_text {
-
+	height: calc(100% - 500rpx);
 	position: relative;
-	padding: 100rpx 60rpx;
+	padding: 100rpx 60rpx 0;
 	background-color: #ffffff;