diff --git a/pages/welcome/welcome.vue b/pages/welcome/welcome.vue
index edb0907..7d565b3 100644
--- a/pages/welcome/welcome.vue
+++ b/pages/welcome/welcome.vue
@@ -17,10 +17,10 @@
},
onLoad(options) {
- uni.reLaunch({
- url: '/pages/login/login'
- })
- return
+ // uni.reLaunch({
+ // url: '/pages/login/login'
+ // })
+ // return
let that = this;
diff --git a/subpackages/applyPeriod/applyPeriod.vue b/subpackages/applyPeriod/applyPeriod.vue
index 61c4d80..d2bf23e 100644
--- a/subpackages/applyPeriod/applyPeriod.vue
+++ b/subpackages/applyPeriod/applyPeriod.vue
@@ -25,36 +25,54 @@
+
+
+
+ 注册资本:
+
+
+
+
银联贴息方式(可多选):
-
+
+
+
+
+
+
+
+
- 银联分期费率(1类银行):范围(0~20)
+ 银联分期费率(1类银行):范围(0~1)最多保留3位小数
{{item.periodNum}}期
-
- 银联分期费率(2类银行):范围(0~20)
+ 银联分期费率(2类银行):范围(0~1)最多保留3位小数
{{item.periodNum}}期
-
@@ -125,6 +143,7 @@
unionpayRate1: [], //银联分期费率(1类银行)
unionpayRate2: [], //银联分期费率(2类银行)
agreementPics: '', // 协议照片(多张)
+ authCapital:'',//注册资本
},
periodNumList:[],//分期数列表
@@ -198,6 +217,7 @@
this.periodData.unionpayRate1 =this.handleUnionpayRate(this.showItem.unionpayRate1);
this.periodData.unionpayRate2 = this.handleUnionpayRate(this.showItem.unionpayRate2);
this.periodData.agreementPics = this.showItem.platformPeriod.agreementPics;
+ this.periodData.authCapital = this.showItem.platformPeriod.authCapital;
this.imgValue =this.periodData.agreementPics.split(',');
}else{
this.periodData.openUnionpay = true;
@@ -205,18 +225,17 @@
this.periodData.unionpayRate1 = this.handleUnionpayRate(this.periodNumList);
this.periodData.unionpayRate2 =this.handleUnionpayRate(this.periodNumList);
this.periodData.agreementPics = "";
+ this.periodData.authCapital ="";
this.imgValue =[];
}
- let arr = this.periodData.unionpayFeePaid.split(",");
+
this.unionpayFeePaidList.forEach(item => {
item.isSelect = false;
- arr.forEach(item2 => {
- if (item.id == item2) {
- item.isSelect = true;
- }
- })
+ if(this.periodData.unionpayFeePaid==item.id){
+ item.isSelect = true;
+ }
})
},
@@ -235,12 +254,17 @@
/* 贴息方式change */
checkBoxChange(e) {
- let selectArr = e.detail.value;
- this.periodData.unionpayFeePaid = selectArr.join(',');
+
+ console.log(e.detail.value)
+
+ this.periodData.unionpayFeePaid = e.detail.value;
+
+ // let selectArr = e.detail.value;
+ // this.periodData.unionpayFeePaid = selectArr.join(',');
},
/* 点击申请分期 */
apply() {
- if (!this.isVertify()) return;
+ if (!this.isVertify()) return;
uni.showLoading({
title: '加载中',
@@ -281,8 +305,20 @@
})
return false
}
-
- var reg = /^(([0-9]|[1][0-9])([.][0-9]{1,2})|([0-9]|1[0-9]|20))$/;
+
+ if(this.periodData.authCapital == ''){
+ uni.showToast({
+ title: '请输入注册资本',
+ icon: 'none'
+ })
+ return false
+ }
+
+
+
+ // var reg = /^(([0-9]|[1][0-9])([.][0-9]{1,2})|([0-9]|1[0-9]|20))$/;
+ /* 0-1:最多保留三位小数 */
+ let reg = /^((0+(\.\d{0,3})?)|1(\.0{0,3})?)$/;
let unionpayRate1Bool = this.periodData.unionpayRate1.every((item) => {
if (!reg.test(item.rate)) {
@@ -485,6 +521,8 @@
.fn {
font-weight: normal;
+ font-size: 12px;
+ color: #3c3c3c;
}
.down {
@@ -497,7 +535,7 @@
margin-bottom: 20rpx;
border-radius: 20rpx;
- input,.rate {
+ .rate {
height: 20px;
line-height: 20px;
border-radius: 10px;