diff --git a/pages/store/settled/index.vue b/pages/store/settled/index.vue
index e3a1468..e59dd7a 100644
--- a/pages/store/settled/index.vue
+++ b/pages/store/settled/index.vue
@@ -24,7 +24,7 @@
申请记录
-
+
店铺名称
@@ -479,12 +479,12 @@
},
validateBtn() {
let {
- shopName,mer_classification,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,EnterpriseRooter,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
+ shopName,businessAddress,businessAddressDetail,EnterpriseType,EnterpriseName,EnterpriseJoinName,EnterprisePhone,EnterpriseId,userName,userPhone,userId,userPhoto,isVeteran,isVeteranPhoto,isFlagshipStore,isFlagshipStorePhoto,mer_type,mer_storeType
} = this.shopInfo;
+ console.log(this.shopInfo);
-
- if (shopName&&mer_classification&&businessAddress&&businessAddressDetail&&EnterpriseType&&EnterpriseName&&EnterpriseJoinName&&EnterprisePhone&&EnterpriseId&&EnterpriseRooter&&userName&&userPhone&&userId&&userPhoto&&mer_type&&mer_storeType ) {
+ if (shopName&&businessAddress&&businessAddressDetail&&EnterpriseType&&EnterpriseName&&EnterpriseJoinName&&EnterprisePhone&&EnterpriseId&&userName&&userPhone&&userId&&userPhoto&&mer_type&&mer_storeType ) {
if(isVeteran&&!isVeteranPhoto){
return
}else if (isFlagshipStore&&!isFlagshipStorePhoto){
@@ -520,6 +520,8 @@
this.validate = true;
+ }else{
+ this.validate=false;
}
},
// 获取商户分类
@@ -562,7 +564,25 @@
this.shopInfo.EnterpriseType = this.enterpriseArray[e.target.value];
this.validateBtn();
},
+ checkPhone(phone) {
+ return /^1[3-9]\d{9}$/.test(phone);
+ },
nextStep() {
+ let a=this.checkPhone(this.shopInfo.userPhone);
+ let b=this.checkPhone(this.shopInfo.EnterprisePhone);
+ if(!a||!b){
+ uni.showToast({
+ icon:'none',
+ title: '手机号格式有误'
+ });
+ return
+ }else if(this.shopInfo.userPhoto){
+ uni.showToast({
+ icon:'none',
+ title: '请上传手持介绍信'
+ });
+ return
+ }
if(this.mer_i_id){
uni.navigateTo({
url: '/pages/store/settled/step2?mer_i_id='+this.mer_i_id
diff --git a/pages/store/settled/step2.vue b/pages/store/settled/step2.vue
index edc3ea0..04c7d6b 100644
--- a/pages/store/settled/step2.vue
+++ b/pages/store/settled/step2.vue
@@ -351,6 +351,8 @@
data2.idcard=idcard;
uni.setStorageSync('shopInfo',data2);
this.validate=true;
+ }else{
+ this.validate=false;
}
},
changeBusiness(e){
@@ -366,6 +368,19 @@
this.validateBtn();
},
nextStep(){
+ if(this.shopInfo.idCardPhoto.length!=2){
+ uni.showToast({
+ icon:'none',
+ title: '请身份证正反面'
+ });
+ return
+ }else if(this.shopInfo.businessLicense){
+ uni.showToast({
+ icon:'none',
+ title: '请上传营业执照'
+ });
+ return
+ }
if(this.mer_i_id){
uni.navigateTo({
url:'/pages/store/settled/step3?mer_i_id='+this.mer_i_id