diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index a9564e9..2ce6f12 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -161,6 +161,9 @@
v-model="shopInfo.EnterprisePhone" @input="validateBtn"
placeholder-class='placeholder' />
+
+ 请填写11位手机号码
+
@@ -185,6 +188,9 @@
+
+ 请填写11位手机号码
+
@@ -241,7 +247,7 @@
- 是否惠美乡村店铺
+ 是否惠美乡村店铺
@@ -279,7 +285,7 @@
- 是否退伍军人
+ 是否退伍军人
diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue
index d8c3f21..69d0093 100644
--- a/pages/store/settled/step2.vue
+++ b/pages/store/settled/step2.vue
@@ -83,7 +83,10 @@
- 请检查格式是否为:20190101
+ 请检查格式是否为:x年x月x日
+
+
+ 如为长期有效,请填写:2099年01月01日
@@ -99,7 +102,10 @@
- 请检查格式是否为:20190101
+ 请检查格式是否为:x年x月x日
+
+
+ 如为长期有效,请填写:2099年01月01日
@@ -146,6 +152,9 @@
请检查格式是否为:x年x月x日
+
+ 如为长期有效,请填写:2099年01月01日
+
@@ -155,6 +164,9 @@
请检查格式是否为:x年x月x日
+
+ 如为长期有效,请填写:2099年01月01日
+
@@ -267,6 +279,10 @@
}
},
methods: {
+ isValidDate(dateString) {
+ var regex = /^\d{1,4}年\d{1,2}月\d{1,2}日$/;
+ return regex.test(dateString);
+ },
getGoodsDetails(){
let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
let data2=uni.getStorageSync('updateShopInfo');
@@ -379,6 +395,18 @@
icon:'none',
title: '请上传营业执照'
});
+ return
+ }else if(!this.isValidDate(this.shopInfo.idCardStartTime)||!this.isValidDate(this.shopInfo.idCardEndTime)){
+ uni.showToast({
+ icon:'none',
+ title: '法人身份证有效期格式错误'
+ });
+ return
+ }else if(!this.isValidDate(this.shopInfo.countStartTime)||!this.isValidDate(this.shopInfo.countEndTime)){
+ uni.showToast({
+ icon:'none',
+ title: '统一社会信用证日期格式错误'
+ });
return
}
if(this.mer_i_id){
@@ -605,6 +633,11 @@
font-size:20rpx;
padding: 12rpx 12rpx 0 12rpx;
}
+ .acea-row .tips-text-yellow{
+ color: #ffc315;
+ font-size:20rpx;
+ padding: 12rpx 12rpx 0 12rpx;
+ }
.acea-row.row-column {
-webkit-box-orient: vertical;
-moz-box-orient: vertical;
diff --git a/pages/store/settled/step3.vue b/pages/store/settled/step3.vue
index b4473bc..ac71e59 100644
--- a/pages/store/settled/step3.vue
+++ b/pages/store/settled/step3.vue
@@ -34,9 +34,9 @@
{{shopInfo.bankCardImg.length}}/1
-
+
@@ -52,7 +52,7 @@
- 户名
+ 结算公户户名
@@ -62,7 +62,7 @@
- 银行卡号
+ 结算公户卡号
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index fb6012d..22fc5c6 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -773,10 +773,11 @@
},
payFunc(val){
let data1=this.payInfo;
+ let that=this;
if(data1.balance_vert){
this.$delete(data1,'balance_vert')
}
- data1.password=val.password;
+ data1.pay_password=val.password;
this.payment(data1);
},
/*预售协议*/
@@ -1278,7 +1279,7 @@
},
payment: function(data) {
let that = this;
- if(!data.password){
+ if(!data.pay_password){
data.balance_vert=1;
this.payInfo=data;
}
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index fa28622..c57f108 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -59,7 +59,7 @@
积分
-
+
确认赠送
@@ -152,11 +152,12 @@
},
async payFunc(val){
let d={
+ balance_vert:0,
real_name:this.presentExp.real_name,
phone:this.presentExp.phone,
card_id:this.presentExp.card_id,
integral:this.presentExp.integral,
- password:val.password
+ pay_password:val.password
}
await integralGive(d).then((res)=>{
if(res){
@@ -178,6 +179,13 @@
},
async giveaway(){
let {real_name,phone,card_id,integral}=this.presentExp
+ if(integral<=0){
+ uni.showToast({
+ icon:'none',
+ title: '积分数量必须大于0',
+ });
+ return
+ }
if(real_name&&phone&&card_id&&integral){
let d={