diff --git a/pages/order/register/index.js b/pages/order/register/index.js index d6a1c01..f4af6b0 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -134,7 +134,7 @@ Page({ icon: 'none' }) } - else if(this.data.main_type == 0&&(this.data.cardid == ''|| !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/.test(this.data.cardid))){ + else if(this.data.cardid == ''|| !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/.test(this.data.cardid)){ wx.showToast({ title: '请填写正确客户身份证', icon: 'none' @@ -512,7 +512,6 @@ Page({ changeMain(e) { this.setData({ main_type:e.detail.value, - cardid:'', owner_name:'', owner_mobile:'', owner_cardid:'', @@ -621,9 +620,7 @@ Page({ params['pro'] = that.data.region; params['address'] = that.data.address; } - if(that.data.cardid != ''){ - params['cardid'] = that.data.cardid; - } + params['cardid'] = that.data.cardid; params['car_id'] = that.data.car_id; params['v_id'] = that.data.v_id; params['color_id'] = that.data.color_id; @@ -754,7 +751,7 @@ Page({ icon: 'none' }) } - else if(this.data.main_type == 0&&(this.data.cardid == ''|| !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/.test(this.data.cardid))){ + else if(this.data.cardid == ''|| !/^\d{6}(18|19|20)?\d{2}(0[1-9]|1[012])(0[1-9]|[12]\d|3[01])\d{3}(\d|[xX])$/.test(this.data.cardid)){ wx.showToast({ title: '请填写正确客户身份证', icon: 'none' @@ -843,9 +840,7 @@ Page({ params['pro'] = that.data.region; params['address'] = that.data.address; } - if(that.data.cardid != ''){ - params['cardid'] = that.data.cardid; - } + params['cardid'] = that.data.cardid; if(that.data.owner_name != ''){ params['owner_name'] = that.data.owner_name; } diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index cb135db..4ed3711 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -34,7 +34,7 @@ - + 客户身份证*