From 6bd38d8761de4bca18b2431b0086c7d5407d323f Mon Sep 17 00:00:00 2001
From: yangtao <yang1793766139@163.com>
Date: Fri, 12 Apr 2024 18:33:58 +0800
Subject: [PATCH] 1

---
 pages/store/settled/index.vue       | 10 ++++++--
 pages/store/settled/step2.vue       | 37 +++++++++++++++++++++++++++--
 pages/store/settled/step3.vue       |  8 +++----
 pages/users/order_confirm/index.vue |  5 ++--
 pages/users/user_integral/index.vue | 12 ++++++++--
 5 files changed, 60 insertions(+), 12 deletions(-)

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' />
 						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text">请填写11位手机号码</text>
+						</view>
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
@@ -185,6 +188,9 @@
 							<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.userPhone"
 								@input="validateBtn" placeholder-class='placeholder' />
 						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text">请填写11位手机号码</text>
+						</view>
 					</view>
 					
 					<view class="item">
@@ -241,7 +247,7 @@
 						<view class="uni-list">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">是否惠美乡村店铺</text>
+									<text class="item-name ">是否惠美乡村店铺</text>
 									<switch :checked="shopInfo.isVeteran" style="transform:scale(0.6)"
 										@change="viteran" />
 								</view>
@@ -279,7 +285,7 @@
 						<view class="uni-list">
 							<view class="uni-list-cell">
 								<view class="uni-list-cell-db acea-row row-middle">
-									<text class="item-name required">是否退伍军人</text>
+									<text class="item-name">是否退伍军人</text>
 									<switch :checked="shopInfo.isFlagshipStore" style="transform:scale(0.6)"
 										@change="flagShipStore" />
 								</view>
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 @@
 									</view>
 								</view>
 								<view class="acea-row row-middle">
-									<text class="tips-text" >请检查格式是否为：20190101</text>
+									<text class="tips-text" >请检查格式是否为：x年x月x日</text>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text>
 								</view>
 							</view>
 						</view>
@@ -99,7 +102,10 @@
 									</view>
 								</view>
 								<view class="acea-row row-middle">
-									<text class="tips-text" >请检查格式是否为：20190101</text>
+									<text class="tips-text" >请检查格式是否为：x年x月x日</text>
+								</view>
+								<view class="acea-row row-middle">
+									<text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text>
 								</view>
 							</view>
 						</view>
@@ -146,6 +152,9 @@
 						<view class="acea-row row-middle">
 							<text class="tips-text" >请检查格式是否为：x年x月x日</text>
 						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text>
+						</view>
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
@@ -155,6 +164,9 @@
 						<view class="acea-row row-middle">
 							<text class="tips-text" >请检查格式是否为：x年x月x日</text>
 						</view>
+						<view class="acea-row row-middle">
+							<text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text>
+						</view>
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
@@ -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
 									</view>
 								</view>
-								<view class="acea-row row-middle">
+								<!-- <view class="acea-row row-middle">
 									<text class="tips-text" style="color: #0ca6cb;">提示：上传完该项,下面几项会自动填写</text>
-								</view>
+								</view> -->
 								<view class="acea-row row-middle" style="justify-content: flex-start;">
 									<view class='pictrue' v-for="(item,index) in shopInfo.bankCardImg" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.bankCardImg,index)">
 										<image :src='item'></image>
@@ -52,7 +52,7 @@
 					</view>
 					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">户名</text>
+							<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">
@@ -62,7 +62,7 @@
 					
 					<view class="item">
 						<view class="acea-row row-middle">
-							<text class="item-name required">银行卡号</text>
+							<text class="item-name required">结算公户卡号</text>
 							<input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.bankCard" @input="validateBtn" placeholder-class='placeholder' />
 						</view>
 						<view class="acea-row row-middle">
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 @@
 					</view>
 					<view class="list-item">
 						<text>积分</text>
-						<input type="text" placeholder="请输入积分" v-model="presentExp.integral"/>
+						<input type="number" placeholder="请输入积分" v-model="presentExp.integral"/>
 					</view>
 					<view class="list-btn" @click="giveaway">
 						确认赠送
@@ -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={