lhl 3 years ago
parent
commit
8f4243f1bc

+ 8 - 7
pages/money/pay.vue

@@ -20,14 +20,14 @@
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 2"></radio></label>
 			</view>
 			</view>
 			<!-- #endif -->
 			<!-- #endif -->
-			<!-- <view class="type-item" @click="changePayType(3)">
+			<view class="type-item" @click="changePayType(3)">
 				<text class="icon iconfont iconyue"></text>
 				<text class="icon iconfont iconyue"></text>
 				<view class="con">
 				<view class="con">
 					<text class="tit">余额支付</text>
 					<text class="tit">余额支付</text>
 					<text>可用余额 ¥{{ now_money }}</text>
 					<text>可用余额 ¥{{ now_money }}</text>
 				</view>
 				</view>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
 				<label class="radio"><radio value="" color="#5dbc7c" :checked="payType == 3"></radio></label>
-			</view> -->
+			</view>
 		</view>
 		</view>
 		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</text>
 		<text class="mix-btn" :class="{ clickbg: payLoding }" @click="!payLoding ? confirm() : ''">确认支付</text>
 	</view>
 	</view>
@@ -199,10 +199,7 @@ export default {
 		//确认支付
 		//确认支付
 		confirm: async function() {
 		confirm: async function() {
 			let obj = this;
 			let obj = this;
-			uni.showLoading({
-				title: '支付中',
-				mask: true
-			})
+			
 			// 判断是否余额不足
 			// 判断是否余额不足
 			if (obj.payName == 'yue' && +obj.now_money < obj.money) {
 			if (obj.payName == 'yue' && +obj.now_money < obj.money) {
 				uni.showModal({
 				uni.showModal({
@@ -214,7 +211,11 @@ export default {
 					complete: () => {}
 					complete: () => {}
 				});
 				});
 				return;
 				return;
-			}
+			}
+			uni.showLoading({
+				title: '支付中',
+				mask: true
+			})
 			// 支付中
 			// 支付中
 			obj.payLoding = true;
 			obj.payLoding = true;
 			// #ifdef H5
 			// #ifdef H5

File diff suppressed because it is too large
+ 0 - 0
unpackage/dist/build/mp-weixin/pages/money/pay.js


+ 1 - 1
unpackage/dist/build/mp-weixin/pages/money/pay.wxml

@@ -1 +1 @@
-<view class="app"><view class="price-box"><text>支付金额</text><text class="price">{{money}}</text></view><view class="pay-type-list"><view data-event-opts="{{[['tap',[['changePayType',[1]]]]]}}" class="type-item b-b" bindtap="__e"><text class="icon iconfont iconweixin"></text><view class="con"><text class="tit">微信支付</text><text>推荐使用微信支付</text></view><label class="radio"><radio value="" color="#5dbc7c" checked="{{payType==1}}"></radio></label></view></view><text data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="{{['mix-btn',(payLoding)?'clickbg':'']}}" bindtap="__e">确认支付</text></view>
+<view class="app"><view class="price-box"><text>支付金额</text><text class="price">{{money}}</text></view><view class="pay-type-list"><view data-event-opts="{{[['tap',[['changePayType',[1]]]]]}}" class="type-item b-b" bindtap="__e"><text class="icon iconfont iconweixin"></text><view class="con"><text class="tit">微信支付</text><text>推荐使用微信支付</text></view><label class="radio"><radio value="" color="#5dbc7c" checked="{{payType==1}}"></radio></label></view><view data-event-opts="{{[['tap',[['changePayType',[3]]]]]}}" class="type-item" bindtap="__e"><text class="icon iconfont iconyue"></text><view class="con"><text class="tit">余额支付</text><text>{{"可用余额 ¥"+now_money}}</text></view><label class="radio"><radio value="" color="#5dbc7c" checked="{{payType==3}}"></radio></label></view></view><text data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="{{['mix-btn',(payLoding)?'clickbg':'']}}" bindtap="__e">确认支付</text></view>

Some files were not shown because too many files changed in this diff