From 8b2f95acc46ccaaea61ecd081171323957b50a9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= Date: Tue, 25 Jan 2022 10:27:12 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order/edit/index2.js | 2 +- pages/order/edit/index2.wxml | 62 +++++++++++----------- pages/order/editOwner/index.js | 8 +++ pages/order/editOwner/index.wxml | 6 +++ pages/order/register/index.js | 34 ++++++------ pages/order/register/index.wxml | 88 +++++++++++++++----------------- 6 files changed, 108 insertions(+), 92 deletions(-) diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js index 3f9bef2..03f418b 100644 --- a/pages/order/edit/index2.js +++ b/pages/order/edit/index2.js @@ -974,7 +974,7 @@ Page({ }) }, - //代办相关 + //委托代办 changeAgency(e) { let agencyList = this.data.agencyList let values = e.detail.value diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml index a12a891..6fe4148 100644 --- a/pages/order/edit/index2.wxml +++ b/pages/order/edit/index2.wxml @@ -133,18 +133,20 @@ - 代办相关* + 委托代办* 当前代办费用:{{srv_total}} - + - + + + @@ -153,7 +155,7 @@ 精品选装 - 价值:{{fine_total}}元 + 总价:{{fine_total}} @@ -221,38 +223,40 @@ 车辆平台售价 {{priceinfo.price}} - - 定金 - {{deposit}} + + 定金 + {{deposit}} - - 车身优惠 - {{disc_money}} + + 车身优惠 + {{disc_money}} 精品尊享包 {{priceinfo.fine_money}} - - 精品优惠 - {{disc_fine_money}} + + 精品优惠 + {{disc_fine_money}} - - 代办相关 - - - {{item.title}} - + + 委托代办 + + + + {{item.title}} + {{item.sprice}} + + + 精品选装 - - 精品选装 - - - {{item.txt}} - + + + {{item.txt}} + {{item.price}} - + diff --git a/pages/order/editOwner/index.js b/pages/order/editOwner/index.js index 66e6ab5..9fa2eb0 100644 --- a/pages/order/editOwner/index.js +++ b/pages/order/editOwner/index.js @@ -6,6 +6,7 @@ Page({ owner_name:'',//车主姓名 owner_mobile:'',//车主手机号 owner_cardid:'',//车主身份证 + address:'',//车主地址 company:'',//企业名称 credit:'',//企业信用代码 submitFlag:false, @@ -34,6 +35,7 @@ Page({ owner_name:res.data.owner_name?res.data.owner_name:'', owner_mobile:res.data.owner_mobile?res.data.owner_mobile:'', owner_cardid:res.data.owner_cardid?res.data.owner_cardid:'', + address:res.data.address?res.data.address:'', company:res.data.company?res.data.company:'', credit:res.data.credit?res.data.credit:'', }) @@ -63,6 +65,12 @@ Page({ icon: 'none' }) } + else if(this.data.main_type == 0&&this.data.address == ''){ + wx.showToast({ + title: '请填写车主地址', + icon: 'none' + }) + } else if(this.data.main_type == 1&&this.data.company == ''){ wx.showToast({ title: '请填写企业名称', diff --git a/pages/order/editOwner/index.wxml b/pages/order/editOwner/index.wxml index f5f1da6..c8e2506 100644 --- a/pages/order/editOwner/index.wxml +++ b/pages/order/editOwner/index.wxml @@ -20,6 +20,12 @@ + + 车主地址* + + + + 企业信息 diff --git a/pages/order/register/index.js b/pages/order/register/index.js index 545733b..6b2b715 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -149,12 +149,6 @@ Page({ icon: 'none' }) } - else if(this.data.address == ''){ - wx.showToast({ - title: '请填写联系地址', - icon: 'none' - }) - } else if(this.data.main_type == 0&&this.data.owner_name == ''){ wx.showToast({ title: '请填写车主姓名', @@ -173,6 +167,12 @@ Page({ icon: 'none' }) } + else if(this.data.main_type == 0&&this.data.address == ''){ + wx.showToast({ + title: '请填写车主地址', + icon: 'none' + }) + } else if(this.data.main_type == 1&&this.data.company == ''){ wx.showToast({ title: '请填写企业名称', @@ -663,7 +663,9 @@ Page({ params['cus_id'] = that.data.customer[that.data.customerIndex].id; params['name'] = that.data.name; params['mobile'] = that.data.mobile; - params['address'] = that.data.address; + if(that.data.address != ''){ + params['address'] = that.data.address; + } if(that.data.cardid != ''){ params['cardid'] = that.data.cardid; } @@ -837,12 +839,6 @@ Page({ icon: 'none' }) } - else if(this.data.address == ''){ - wx.showToast({ - title: '请填写联系地址', - icon: 'none' - }) - } else if(this.data.inten_money == ''){ wx.showToast({ title: '请输入意向金', @@ -867,6 +863,12 @@ Page({ icon: 'none' }) } + else if(this.data.main_type == 0&&this.data.address == ''){ + wx.showToast({ + title: '请填写车主地址', + icon: 'none' + }) + } else if(this.data.main_type == 1&&this.data.company == ''){ wx.showToast({ title: '请填写企业名称', @@ -895,8 +897,10 @@ Page({ params['cus_id'] = that.data.customer[that.data.customerIndex].id; params['name'] = that.data.name; params['mobile'] = that.data.mobile; - params['address'] = that.data.address; params['inten_money'] = that.data.inten_money; + if(that.data.address != ''){ + params['address'] = that.data.address; + } if(that.data.cardid != ''){ params['cardid'] = that.data.cardid; } @@ -943,7 +947,7 @@ Page({ } }, - //代办相关 + //委托代办 changeAgency(e) { let agencyList = this.data.agencyList let values = e.detail.value diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index 82076e5..cd0241f 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -55,12 +55,6 @@ - - 联系地址* - - - - 意向金 @@ -95,6 +89,12 @@ + + 车主地址* + + + + @@ -237,7 +237,7 @@ - 代办相关* + 委托代办* 当前代办费用:{{srv_total}} @@ -257,7 +257,7 @@ 精品选装 - 价值:{{fine_total}}元 + 总价:{{fine_total}} @@ -303,14 +303,6 @@ 用户信息 销售顾问:{{userInfo.uname}} - - 购车主体 - - - {{item.title}} - - - 客户姓名 {{name}} @@ -323,14 +315,6 @@ 客户身份证 {{cardid}} - - 联系地址 - {{address}} - - - 意向金 - {{inten_money}} - 车主姓名 @@ -349,6 +333,10 @@ {{owner_cardid}} + + 车主地址 + {{address}} + 企业名称 @@ -399,38 +387,44 @@ 车辆平台售价 {{priceinfo.price}} - - 定金 - {{deposit}} + + 意向金 + {{inten_money}} - - 车身优惠 - {{disc_money}} + + 定金 + {{deposit}} + + + 车身优惠 + {{disc_money}} 精品尊享包 - {{priceinfo.fine_money}}元 + {{priceinfo.fine_money}} - - 精品优惠 - {{disc_fine_money}} + + 精品优惠 + {{disc_fine_money}} - - 代办相关 - - - {{item.title}} - + + 委托代办 + + + + {{item.title}} + {{item.sprice}} + + + 精品选装 - - 精品选装 - - - {{item.txt}} - + + + {{item.txt}} + {{item.price}} - +