theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'zhy' (#353) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/353
This commit is contained in:
hansu 2020-09-09 09:36:34 +08:00
commit 7e50a6f56e
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pageE/mine/MineConcerns.vue
View File

@ -27,7 +27,7 @@ import storeViwe from './storeConcerns'
export default {
data() {
return {
list: [{ name: "商家" }, { name: "达人" }],
list: [{ name: "店铺" }, { name: "达人" }],
daren: [],
shangjia:[],
height: 0,

9
pageE/more/EditInvoice.vue
View File

@ -19,7 +19,7 @@
<view class="personal" v-show="type==1">
<view class="info-item">
<view class="title">手机号</view>
<input type="number" placeholder="请输入您的手机号" maxlength="11" v-model="personalPhone" />
<input type="text" placeholder="请输入您的手机号" maxlength="11" v-model="personalPhone" />
</view>
<view class="info-item">
<view class="title">身份证号</view>
@ -37,7 +37,7 @@
</view>
<view class="info-item">
<view class="title">电话号码</view>
<input type="number" placeholder="请输入公司电话" maxlength="11" v-model="companyPhone" />
<input type="text" placeholder="请输入公司电话" maxlength="11" v-model="companyPhone" />
</view>
<view class="info-item">
<view class="title">开户银行</view>
@ -91,6 +91,7 @@ export default {
this.action == 1 ? this.invoiceAdd() : this.invoiceEdit();
},
verificationParams() {
const phone = /^0\d{2,3}-?\d{7,8}$/;
if(this.type == 1) {
if(this.$u.test.isEmpty(this.title)) {
this.$u.toast('发票抬头不可为空');
@ -100,7 +101,7 @@ export default {
this.$u.toast('手机号不可为空');
return false;
}
if(!this.$u.test.mobile(this.personalPhone)) {
if(!this.$u.test.mobile(this.personalPhone) && !phone.test(this.personalPhone)) {
this.$u.toast('请正确填写手机号');
return false;
}
@ -129,7 +130,7 @@ export default {
this.$u.toast('电话号码不可为空');
return false;
}
if(!this.$u.test.mobile(this.companyPhone)) {
if(!this.$u.test.mobile(this.companyPhone) && !phone.test(this.companyPhone)) {
this.$u.toast('请正确填写电话号码');
return false;
}

4
pages/mine/index.vue
View File

@ -166,7 +166,7 @@ export default {
},
{
name: 'refund',
title: '售后',
title: '退款售后',
img: '/static/image/mine/9.png',
link: '/order/Index?current=7',
number: '',
@ -437,7 +437,7 @@ export default {
> view:nth-child(6){
@include image-size($image-width: 33rpx, $image-height: 35rpx);
.order-num {
left: 24rpx;
left: 44rpx;
}
}
}