1

pages/store/settled/index.vue

@@ -143,7 +143,8 @@
 								v-model="shopInfo.EnterpriseId" @input="validateBtn" placeholder-class='placeholder' />
 						</view>
 						<view class="acea-row row-middle">
-							<text class="tips-text">请填写铸源商城ZY开头会员编号</text>
+							<!-- <text class="tips-text">请填写铸源商城ZY开头会员编号</text> -->
+							<text class="tips-text">请填写铸源优品ID号</text>
 						</view>
 					</view>
 					<view class="item">
@@ -172,7 +173,8 @@
 								@input="validateBtn" placeholder-class='placeholder' />
 						</view>
 						<view class="acea-row row-middle">
-							<text class="tips-text">请填写铸源商城ZY开头会员编号</text>
+							<!-- <text class="tips-text">请填写铸源商城ZY开头会员编号</text> -->
+							<text class="tips-text">请填写铸源优品ID号</text>
 						</view>
 					</view>
 					<view class="item">
@@ -488,14 +490,12 @@
 					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&&businessAddress&&businessAddressDetail&&EnterpriseType&&EnterpriseName&&EnterpriseJoinName&&EnterprisePhone&&EnterpriseId&&userName&&userPhone&&userId&&userPhoto&&mer_type&&mer_storeType ) {
-					if(isVeteran&&!isVeteranPhoto){
+					if(isVeteran&&isVeteranPhoto.length==0){
-						return 
+						this.validate=false; 
-					}else if (isFlagshipStore&&!isFlagshipStorePhoto){
+					}else if (isFlagshipStore&&isFlagshipStorePhoto.length==0){
-						return 
+						this.validate=false; 
-					}
+					}else{
 						let date2 = {
 							phone: userPhone,
 							mer_name:shopName,
@@ -526,6 +526,8 @@
 						
 						
 						this.validate = true;
+					}
+					
 				}else{
 					this.validate=false;
 				}
@@ -603,9 +605,11 @@
 			viteran(e) {
 				// console.log('e: ',e);
 				this.shopInfo.isVeteran = e.detail.value;
+				this.validateBtn();
 			},
 			flagShipStore(e) {
 				this.shopInfo.isFlagshipStore = e.detail.value;
+				this.validateBtn();
 			},
 			/**
 			 * 上传文件

pages/store/settled/step2.vue

@@ -387,7 +387,7 @@
 				if(this.shopInfo.idCardPhoto.length!=2){
 					uni.showToast({
 						icon:'none',
-						title: '请身份证正反面'
+						title: '请上传身份证正反面'
 					});
 					return 
 				}else if(this.shopInfo.businessLicense.length!=1){
@@ -396,16 +396,29 @@
 						title: '请上传营业执照'
 					});
 					return
-				}else if(!this.isValidDate(this.shopInfo.idCardStartTime)||!this.isValidDate(this.shopInfo.idCardEndTime)){
+				}else if(!this.isValidDate(this.shopInfo.idCardStartTime)){
 					uni.showToast({
 						icon:'none',
-						title: '法人身份证有效期格式错误'
+						title: '法人身份证有效期开始格式错误'
 					});
 					return 
-				}else if(!this.isValidDate(this.shopInfo.countStartTime)||!this.isValidDate(this.shopInfo.countEndTime)){
+				}else if(!this.isValidDate(this.shopInfo.idCardEndTime)){
 					uni.showToast({
 						icon:'none',
-						title: '统一社会信用证日期格式错误'
+						title: '法人身份证有效期结束格式错误'
+					});
+					return 
+				}else if(!this.isValidDate(this.shopInfo.countStartTime)){
+					uni.showToast({
+						icon:'none',
+						title: '统一社会信用证开始日期格式错误'
+					});
+					return 
+				}
+				else if(!this.isValidDate(this.shopInfo.countEndTime)){
+					uni.showToast({
+						icon:'none',
+						title: '统一社会信用证截止日期格式错误'
 					});
 					return 
 				}
@@ -576,6 +589,21 @@
 		padding: 8rpx 18rpx;
 		border-radius: 20px 0px 0px 20px;
 	}
+	.merchantsSettled .list .fail-style{
+		// border: solid 1px red;
+		background-color: rgba(255, 24, 24,0.1);
+		animation: errorTips 1s ease-in-out;
+	}
+	@keyframes errorTips {
+		to{
+			// border: solid 1px red;
+			background-color: white;
+		}
+		form{
+			background-color: rgba(255, 24, 24,0.1);
+			// border: none;
+		}
+	}
 	.merchantsSettled .list .item {
 		padding: 50rpx 0 20rpx;
 		border-bottom: 1px solid #eee;
@@ -728,6 +756,7 @@
 	.merchantsSettled .list .item input {
 		// width: 400rpx;
 		font-size: 30rpx;
+		padding-right: 20rpx;
 	}
 	.merchantsSettled .list .item .placeholder {
 		color: #b2b2b2;

pages/store/settled/step3.vue

@@ -55,9 +55,12 @@
 							<text class="item-name required">结算公户户名</text>
 							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.bankCardUserName" @input="validateBtn" placeholder-class='placeholder' />
 						</view>
-						<view class="acea-row row-middle">
+						<view class="acea-row row-middle" v-if="shopInfo.bankCardUserName">
 							<text class="tips-text" >提示：请核验信息是否正确</text>
 						</view>
+						<view class="acea-row row-middle" v-else>
+							<text class="tips-text" >提示：(公户户名需手动填写)</text>
+						</view>
 					</view>
 					
 					<view class="item">