Commit 54789650 authored by dragondean@qq.com's avatar dragondean@qq.com

修复肤质订单送货日期异常

parent cda238a7
...@@ -465,7 +465,7 @@ ...@@ -465,7 +465,7 @@
<view class="corder-v5-v corder-picker" > <view class="corder-v5-v corder-picker" >
<view class="corder-v5-label"><span class="redcolor">*</span>{{$lang.lang.create.date}}</view> <view class="corder-v5-label"><span class="redcolor">*</span>{{$lang.lang.create.date}}</view>
<picker mode="date" class="date-picker" :value="date" :start="startDate" :end="endDate" @change="bindDateChange"> <picker mode="date" class="date-picker" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
<view class="uni-input">{{date}}</view> <view class="uni-input">{{params.deliveryDate ? params.deliveryDate.split(" ")[0] : '请选择'}}</view>
</picker> </picker>
<image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image> <image class="rgt" src="../../static/img/rgt.png" mode="widthFix"></image>
</view> </view>
...@@ -1106,7 +1106,7 @@ ...@@ -1106,7 +1106,7 @@
channelId:0,//渠道ID channelId:0,//渠道ID
orderItemVOList:[], orderItemVOList:[],
costVO:{}, costVO:{},
deliveryDate:currentDate+' 00:00:00', deliveryDate: null,
drawee:2, drawee:2,
number:'', number:'',
isCargoControl:false, isCargoControl:false,
...@@ -1148,7 +1148,7 @@ ...@@ -1148,7 +1148,7 @@
dialCode:'', dialCode:'',
id:0 id:0
}, },
date:currentDate, date: '',
time:'00:00', time:'00:00',
isClick:false, isClick:false,
link:'', link:'',
...@@ -1732,12 +1732,12 @@ ...@@ -1732,12 +1732,12 @@
title: this.$lang.lang.notices.consigneePhone, title: this.$lang.lang.notices.consigneePhone,
icon: 'error', icon: 'error',
}) })
}else if(!this.params.isCargoControl && this.params.countryCode==this.config.countrySn.value[0]){ }/*else if(!this.params.isCargoControl && this.params.countryCode==this.config.countrySn.value[0]){
return uni.showToast({ return uni.showToast({
title: this.$lang.lang.notices.foreignConsignee, title: this.$lang.lang.notices.foreignConsignee,
icon: 'error', icon: 'error',
}) })
} }*/
if(this.params.consigneeEmail){ if(this.params.consigneeEmail){
let email_reg = /[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/ let email_reg = /[a-zA-Z0-9]+([-_.][A-Za-zd]+)*@([a-zA-Z0-9]+[-.])+[A-Za-zd]{2,5}$/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment