Merge branch 'master' of http://git.liuniu946.com/xiemingyang/zhengyi

pages/index/fugou.vue

@@ -42,13 +42,20 @@
 						<view class="type">选择支付方式</view>
 						<view class="image" @click="close"><image src="../../static/img/x.png" mode="aspectFill"></image></view>
 					</view>
-					<view class="paybox-main flex">
+					<!-- <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(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>
@@ -103,8 +110,8 @@ export default {
 				// }
 			],
 			desc: '', //备注
-			payType: 1, //1微信 2余额 2佣金
-			payName:'weixin',
+			payType: 2, //1微信 2余额 2佣金
+			payName:'yue',
 			// 商品列表
 			shopList: '',
 			// 购物车id
@@ -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/money/pay.vue

@@ -16,11 +16,11 @@
 			</view>
 			<!-- #endif -->
 			<!-- #ifdef APP-PLUS -->
-			<view class="type-item b-b" @click="changePayType(2)">
+			<!-- <view class="type-item b-b" @click="changePayType(2)">
 				<text class="icon iconfont iconzhifubao"></text>
 				<view class="con"><text class="tit">支付宝支付</text></view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
-			</view>
+			</view> -->
 			<!-- #endif -->
 			<view class="type-item" @click="changePayType(3)">
 				<text class="icon iconfont iconyue"></text>

pages/public/login.vue

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

pages/public/register.vue

@@ -70,7 +70,7 @@ export default {
 			parent_area: '',//区域
 			parent_areas: ['A','B','C'],//区域列表
 			pay_type: '',
-			pay_types: ['微信','余额','佣金'],
+			pay_types: ['余额','佣金'],
 			isSelsect: false,
 			isinvitation: false,
 			isparent_area: false,

pages/set/userinfo.vue

@@ -42,7 +42,7 @@
   	</view>
   	<view class="submit-box" >
   		<view class="submit" @click="edit">确认修改</view>
-  		<view class="submit" @click="toLogout">退出登录</view>
+  		<view class="submit1" @click="toLogout">退出登录</view>
   	</view>
   	
   </view>
@@ -199,7 +199,17 @@
   			text-align: center;
   			padding:26rpx 0rpx;
   			border-radius: 50rpx;
-  		}
+  		}
+		.submit1{
+			margin: 40rpx auto;
+			width: 560rpx;
+			border: 1px solid #6EAB4E;
+			background-color: #FFFFFF;
+			color: #6EAB4E;
+			text-align: center;
+			padding:26rpx 0rpx;
+			border-radius: 50rpx;
+		}
   	}
     .jg {
       margin-bottom: 20rpx;