Merge branch 'master' of http://git.qiniu1314.com/cmy/yzf

pages/index/pledge.vue

@@ -70,7 +70,7 @@
 		getIndex
 	} from '@/api/index.js';
 	import {
-		mapState
+		mapState,
 	} from 'vuex';
 	import {
 		qianBao
@@ -160,11 +160,11 @@
 									}).then((
 										data
 									) => {
-								        uni.showModal({
-								        	title: '提示',
-								        	content: data.msg,
-								        	icon:'none'
-								        });
+										obj.qianBao();
+										uni.showToast({
+											title: data.msg,
+											icon:'none'
+										});
 									})
 									.catch(e => {
 										console.log(e);
@@ -225,12 +225,31 @@
 			submission() {
 				let obj = this;
 				if(obj.bankList.length > 0){
+					if(!obj.number){
+						uni.showToast({
+							title: '请输入数量',
+							icon:'none'
+						});
+						return
+					}
+					if(!obj.price){
+						uni.showToast({
+							title: '请输入单价',
+							icon:'none'
+						});
+						return
+					}
 					obj.showBank = true
 				}else{
 					uni.showModal({
-						title: '提示',
-						content: '请先去添加银行卡',
-						icon:'none'
+						title: '请先去添加银行卡',
+						success: res => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url:'/pages/user/set/bindBank'
+								})
+							}
+						},
 					});
 				}
 			},
@@ -240,7 +259,7 @@
 				this.loadingType = 'more';
 				this.loadData();
 				this.qianBao();
-				this.getBank()
+				this.getBank();
 			},
 			tabClick(index) {
 				this.tabCurrentIndex = index;