faiz
/
Huanyuyuehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

This commit is contained in:
yangtao 2024-04-12 18:33:58 +08:00
parent b0022c31a4
commit 6bd38d8761
5 changed files with 60 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pages/store/settled/index.vue
View File

@ -161,6 +161,9 @@
v-model="shopInfo.EnterprisePhone" @input="validateBtn" v-model="shopInfo.EnterprisePhone" @input="validateBtn"
placeholder-class='placeholder' /> placeholder-class='placeholder' />
</view> </view>
<view class="acea-row row-middle">
<text class="tips-text">请填写11位手机号码</text>
</view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -185,6 +188,9 @@
<input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.userPhone" <input type="text" style="text-align: right;" placeholder="请输入" v-model="shopInfo.userPhone"
@input="validateBtn" placeholder-class='placeholder' /> @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
<view class="acea-row row-middle">
<text class="tips-text">请填写11位手机号码</text>
</view>
</view> </view>
<view class="item"> <view class="item">
@ -241,7 +247,7 @@
<view class="uni-list"> <view class="uni-list">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <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)" <switch :checked="shopInfo.isVeteran" style="transform:scale(0.6)"
@change="viteran" /> @change="viteran" />
</view> </view>
@ -279,7 +285,7 @@
<view class="uni-list"> <view class="uni-list">
<view class="uni-list-cell"> <view class="uni-list-cell">
<view class="uni-list-cell-db acea-row row-middle"> <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)" <switch :checked="shopInfo.isFlagshipStore" style="transform:scale(0.6)"
@change="flagShipStore" /> @change="flagShipStore" />
</view> </view>

37
pages/store/settled/step2.vue
View File

@ -83,7 +83,10 @@
</view> </view>
</view> </view>
<view class="acea-row row-middle"> <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> </view>
</view> </view>
@ -99,7 +102,10 @@
</view> </view>
</view> </view>
<view class="acea-row row-middle"> <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> </view>
</view> </view>
@ -146,6 +152,9 @@
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="tips-text" >请检查格式是否为：x年x月x日</text> <text class="tips-text" >请检查格式是否为：x年x月x日</text>
</view> </view>
<view class="acea-row row-middle">
<text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text>
</view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -155,6 +164,9 @@
<view class="acea-row row-middle"> <view class="acea-row row-middle">
<text class="tips-text" >请检查格式是否为：x年x月x日</text> <text class="tips-text" >请检查格式是否为：x年x月x日</text>
</view> </view>
<view class="acea-row row-middle">
<text class="tips-text-yellow" >如为长期有效,请填写:2099年01月01日</text>
</view>
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -267,6 +279,10 @@
} }
}, },
methods: { methods: {
isValidDate(dateString) {
var regex = /^\d{1,4}年\d{1,2}月\d{1,2}日$/;
return regex.test(dateString);
},
getGoodsDetails(){ getGoodsDetails(){
let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo; let {idCardPhoto,idCardName,idCardNumber,idCardStartTime,idCardEndTime,businessLicense,countId,countStartTime,countEndTime,businessScope,registerAddressDetail}=this.shopInfo;
let data2=uni.getStorageSync('updateShopInfo'); let data2=uni.getStorageSync('updateShopInfo');
@ -380,6 +396,18 @@
title: '请上传营业执照' title: '请上传营业执照'
}); });
return 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){ if(this.mer_i_id){
uni.navigateTo({ uni.navigateTo({
@ -605,6 +633,11 @@
font-size:20rpx; font-size:20rpx;
padding: 12rpx 12rpx 0 12rpx; padding: 12rpx 12rpx 0 12rpx;
} }
.acea-row .tips-text-yellow{
color: #ffc315;
font-size:20rpx;
padding: 12rpx 12rpx 0 12rpx;
}
.acea-row.row-column { .acea-row.row-column {
-webkit-box-orient: vertical; -webkit-box-orient: vertical;
-moz-box-orient: vertical; -moz-box-orient: vertical;

8
pages/store/settled/step3.vue
View File

@ -34,9 +34,9 @@
{{shopInfo.bankCardImg.length}}/1 {{shopInfo.bankCardImg.length}}/1
</view> </view>
</view> </view>
<view class="acea-row row-middle"> <!-- <view class="acea-row row-middle">
<text class="tips-text" style="color: #0ca6cb;">提示：上传完该项,下面几项会自动填写</text> <text class="tips-text" style="color: #0ca6cb;">提示：上传完该项,下面几项会自动填写</text>
</view> </view> -->
<view class="acea-row row-middle" style="justify-content: flex-start;"> <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)"> <view class='pictrue' v-for="(item,index) in shopInfo.bankCardImg" :key="index" :data-index="index" @click="getPhotoClickIdx(shopInfo.bankCardImg,index)">
<image :src='item'></image> <image :src='item'></image>
@ -52,7 +52,7 @@
</view> </view>
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <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' /> <input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.bankCardUserName" @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">
@ -62,7 +62,7 @@
<view class="item"> <view class="item">
<view class="acea-row row-middle"> <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' /> <input type="text" style="text-align: right;flex:1;" placeholder="请输入" v-model="shopInfo.bankCard" @input="validateBtn" placeholder-class='placeholder' />
</view> </view>
<view class="acea-row row-middle"> <view class="acea-row row-middle">

5
pages/users/order_confirm/index.vue
View File

@ -773,10 +773,11 @@
}, },
payFunc(val){ payFunc(val){
let data1=this.payInfo; let data1=this.payInfo;
let that=this;
if(data1.balance_vert){ if(data1.balance_vert){
this.$delete(data1,'balance_vert') this.$delete(data1,'balance_vert')
} }
data1.password=val.password; data1.pay_password=val.password;
this.payment(data1); this.payment(data1);
}, },
/*预售协议*/ /*预售协议*/
@ -1278,7 +1279,7 @@
}, },
payment: function(data) { payment: function(data) {
let that = this; let that = this;
if(!data.password){ if(!data.pay_password){
data.balance_vert=1; data.balance_vert=1;
this.payInfo=data; this.payInfo=data;
} }

12
pages/users/user_integral/index.vue
View File

@ -59,7 +59,7 @@
</view> </view>
<view class="list-item"> <view class="list-item">
<text>积分</text> <text>积分</text>
<input type="text" placeholder="请输入积分" v-model="presentExp.integral"/> <input type="number" placeholder="请输入积分" v-model="presentExp.integral"/>
</view> </view>
<view class="list-btn" @click="giveaway"> <view class="list-btn" @click="giveaway">
确认赠送 确认赠送
@ -152,11 +152,12 @@
}, },
async payFunc(val){ async payFunc(val){
let d={ let d={
balance_vert:0,
real_name:this.presentExp.real_name, real_name:this.presentExp.real_name,
phone:this.presentExp.phone, phone:this.presentExp.phone,
card_id:this.presentExp.card_id, card_id:this.presentExp.card_id,
integral:this.presentExp.integral, integral:this.presentExp.integral,
password:val.password pay_password:val.password
} }
await integralGive(d).then((res)=>{ await integralGive(d).then((res)=>{
if(res){ if(res){
@ -178,6 +179,13 @@
}, },
async giveaway(){ async giveaway(){
let {real_name,phone,card_id,integral}=this.presentExp 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){ if(real_name&&phone&&card_id&&integral){
let d={ let d={