From d97c06a053c45c78da327beb650e62285cba1052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E5=8F=B6?= Date: Mon, 27 Jun 2022 15:29:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E5=93=81=E9=80=89=E8=A3=85&=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=94=BB=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commons/js/config.js | 2 +- pages/customer/detail/index.js | 7 +- pages/order/edit/index2.js | 196 +++++++++++++++++++------------- pages/order/edit/index2.wxml | 44 ++----- pages/order/register/index.js | 118 +++++++++++++------ pages/order/register/index.wxml | 34 ++---- 6 files changed, 223 insertions(+), 178 deletions(-) diff --git a/commons/js/config.js b/commons/js/config.js index 3e5969e..869d55c 100644 --- a/commons/js/config.js +++ b/commons/js/config.js @@ -1,4 +1,4 @@ -const env = "d"; +const env = "p"; const version = 1, diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js index cd01acb..d578f4d 100644 --- a/pages/customer/detail/index.js +++ b/pages/customer/detail/index.js @@ -8,7 +8,7 @@ Page({ tabid:1, tab:[ {"id":1,"title":"跟进记录"}, - //{"id":2,"title":"客户画像"}, + {"id":2,"title":"客户画像"}, ], logslist: [],//日志列表 pageNo: 1, @@ -737,6 +737,7 @@ Page({ getAppCustomersTag(){ let params = {}; params['id'] = this.data.id; + params['type'] = 'detail'; _.apiQuery.getAppCustomersTag(params).then(res => { if(res.data.tags&&res.data.tags.length>0){ let taglList = res.data.tags @@ -749,10 +750,6 @@ Page({ }) this.setData({ taglList, - tab:[ - {"id":1,"title":"跟进记录"}, - {"id":2,"title":"客户画像"}, - ], }) } }); diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js index 6fdc69e..3749170 100644 --- a/pages/order/edit/index2.js +++ b/pages/order/edit/index2.js @@ -59,8 +59,7 @@ Page({ isShowRemarks:false,//意向金备注 srv_total:0,//代办费用 agencyList:[],//代办数组 - fine_total_1:0,//精品费用-添加 - fine_total_2:0,//精品费用-选择 + fine_total:0,//精品费用 //if_fine:false,//精品尊享包 @@ -72,6 +71,9 @@ Page({ if_local_bill:0,//本地开具发票 + fineArr:[],//精品选装 + finedIndex:-1,//精品选装索引 + }, //生命周期函数--监听页面加载 onLoad: function (options) { @@ -84,6 +86,7 @@ Page({ this.getAppCusorderV2() this.getAppSeriesBrands() this.getUserInfo() + this.getAppFine() }, @@ -323,45 +326,18 @@ Page({ } //匹配精品赠送 - let fineparams = {}; - fineparams['limbiz'] = 1; - fineparams['page'] = 1; - fineparams['size'] = 100; - _.apiQuery.getAppFine(fineparams).then(res11 => { - if(res.data.fines&&res.data.fines.length>0){ - let fine_total_1 = 0 - let fine_total_2 = 0 - let fines = [] - let fineList = res11.data.list - res.data.fines.forEach(item1 => { - if(item1.id){ - fineList.forEach(item2 => { - if(item1.id == item2.id){ - item2.checked = true - fine_total_2 = fine_total_2 + parseFloat(item2.price) - } - }) - }else{ - fines.push(item1) - if(parseFloat(item1.price)>0){ - fine_total_1 = fine_total_1 + parseFloat(item1.price) - } - } - }) - this.setData({ - fine_total_1, - fine_total_2, - fines, - fineList, - }) - }else{ - this.setData({ - fine_total_1:0, - fine_total_2:0, - fineList:res11.data.list, - }) - } - }); + if(res.data.fines&&res.data.fines.length>0){ + let fine_total = 0 + res.data.fines.forEach(item => { + if(parseFloat(item.price)>0){ + fine_total = fine_total + parseFloat(item.price) + } + }) + this.setData({ + fines:res.data.fines, + fine_total, + }) + } /*end匹配精品赠送*/ }) @@ -840,15 +816,6 @@ Page({ fines.push(item) } }); - that.data.fineList.forEach(item => { - if(item.checked){ - fines.push({ - id:item.id, - txt:item.title, - price:item.price, - }) - } - }) let params = {}; params['id'] = that.data.id; @@ -862,12 +829,13 @@ Page({ params['delry_time'] = that.data.delry_time; params['business_id'] = that.data.priceinfo.id; params['disc_money'] = that.data.priceinfo.sdisc_money?that.data.priceinfo.sdisc_money:0; - if(that.data.sa != ''){ - params['sa'] = that.data.sa; - } + + params['sa'] = that.data.sa; + if(that.data.priceinfo.show_local_bill){ params['if_local_bill'] = that.data.if_local_bill; } + let srv_arr = [] that.data.agencyList.forEach(item => { if(item.checked){ @@ -878,12 +846,9 @@ Page({ }) } }) - if(srv_arr.length>0){ - params['srv_arr'] = srv_arr; - } - if(fines.length>0){ - params['fines'] = fines; - } + params['srv_arr'] = srv_arr; + + params['fines'] = fines; //精品优惠金额 // if(that.data.priceinfo.fine_money){ // params['if_fine'] = that.data.if_fine?'1':'0'; @@ -1032,14 +997,14 @@ Page({ this.setData({ ['fines['+e.currentTarget.dataset.index+'].price']:e.detail.value, }) - let fine_total_1 = 0 + let fine_total = 0 this.data.fines.forEach(item => { if(parseFloat(item.price)>0){ - fine_total_1 = fine_total_1 + parseFloat(item.price) + fine_total = fine_total + parseFloat(item.price) } }) this.setData({ - fine_total_1, + fine_total, }) } }, @@ -1196,26 +1161,99 @@ Page({ }) }, - //精品选装 - changeFines(e) { - let fineList = this.data.fineList - let values = e.detail.value - let fine_total_2 = 0 - fineList.forEach(item1 => { - item1.checked = false - values.forEach(item2 => { - if(item1.id == item2){ - item1.checked = true - if(parseFloat(item1.price)>0){ - fine_total_2 = fine_total_2 + parseFloat(item1.price) - } + //获取精品选装 + getAppFine(){ + let params = {}; + params['limbiz'] = 1; + params['page'] = 1; + params['size'] = 100; + _.apiQuery.getAppFine(params).then(res => { + let fineList = res.data.list + let fineArr = [] + fineList.forEach(item => { + fineArr.push(item.title) + item.price='' + }) + fineArr.push('其他') + this.setData({ + fineArr, + fineList, + }) + }); + }, + + //添加精品选装 + changeFine(e) { + if(this.data.fineArr[e.detail.value]=='其他'){ + this.data.fines.push({ + txt:'', + price:'', + }) + this.setData({ + finedIndex:-1, + fines:this.data.fines, + }) + }else{ + let fid = this.data.fineList[e.detail.value].id + let isadd = false + this.data.fines.forEach(item => { + if(item.id == fid){ + isadd = true } }) - }) + if(isadd){ + wx.showToast({ + title: '您已添加过了', + icon: 'none', + duration: 2000 + }) + }else{ + this.data.fineList.forEach(item => { + if(item.id == fid){ + this.data.fines.push({ + id:item.id, + txt:item.title, + price:'', + }) + this.setData({ + finedIndex:-1, + fines:this.data.fines, + }) + } + }) + } + } - this.setData({ - fineList, - fine_total_2, + }, + + //删除精品选装 + delFine(e){ + let that = this + wx.showModal({ + title: '确定删除吗?', + content: '', + confirmText: "确定删除", + confirmColor: "#36afa2", + cancelText: "取消", + cancelColor: "#666", + success(res) { + if (res.confirm) { + let fines = that.data.fines + fines.splice(e.currentTarget.dataset.index, 1) + that.setData({ + fines, + }) + let fine_total = 0 + that.data.fines.forEach(item => { + if(parseFloat(item.price)>0){ + fine_total = fine_total + parseFloat(item.price) + } + }) + that.setData({ + fine_total, + }) + } + } }) }, diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml index 443010c..b674334 100644 --- a/pages/order/edit/index2.wxml +++ b/pages/order/edit/index2.wxml @@ -169,16 +169,8 @@ 精品选装 - {{fine_total_1+fine_total_2}}元 + {{fine_total}}元 - - - {{item.title}} - - {{item.price}}元 - - - {{item.txt}} @@ -239,34 +231,24 @@ 精品选装 - 总计：{{fine_total_1+fine_total_2}}元 + 总计：{{fine_total}}元 - - - - - - {{item.price}}元 - - - - - - + + + - 添加 + + 添加 + @@ -383,16 +365,8 @@ 精品选装 - {{fine_total_1+fine_total_2}}元 + {{fine_total}}元 - - - {{item.title}} - - {{item.price}}元 - - - {{item.txt}} diff --git a/pages/order/register/index.js b/pages/order/register/index.js index dffb71c..d6a1c01 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -68,8 +68,7 @@ Page({ checktext: '3s', srv_total:0,//代办费用 agencyList:[],//代办数组 - fine_total_1:0,//精品费用-添加 - fine_total_2:0,//精品费用-选择 + fine_total:0,//精品费用 isShowSuccess:false,//是否显示成功提示 isShowContract:false,//是否显示生成合同 @@ -94,6 +93,9 @@ Page({ customer_cardidpic:'',//客户身份证正面照 owner_cardidpic:'',//车主身份证正面照 + fineArr:[],//精品选装 + finedIndex:-1,//精品选装索引 + }, //生命周期函数--监听页面加载 onLoad: function (options) { @@ -608,15 +610,6 @@ Page({ fines.push(item) } }); - that.data.fineList.forEach(item => { - if(item.checked){ - fines.push({ - id:item.id, - txt:item.title, - price:item.price, - }) - } - }) let params = {}; params['main_type'] = that.data.main_type; @@ -981,14 +974,14 @@ Page({ this.setData({ ['fines['+e.currentTarget.dataset.index+'].price']:e.detail.value, }) - let fine_total_1 = 0 + let fine_total = 0 this.data.fines.forEach(item => { if(parseFloat(item.price)>0){ - fine_total_1 = fine_total_1 + parseFloat(item.price) + fine_total = fine_total + parseFloat(item.price) } }) this.setData({ - fine_total_1, + fine_total, }) } }, @@ -1281,32 +1274,93 @@ Page({ params['page'] = 1; params['size'] = 100; _.apiQuery.getAppFine(params).then(res => { + let fineList = res.data.list + let fineArr = [] + fineList.forEach(item => { + fineArr.push(item.title) + item.price='' + }) + fineArr.push('其他') this.setData({ - fineList:res.data.list, + fineArr, + fineList, }) }); }, - //精品选装 - changeFines(e) { - let fineList = this.data.fineList - let values = e.detail.value - let fine_total_2 = 0 - fineList.forEach(item1 => { - item1.checked = false - values.forEach(item2 => { - if(item1.id == item2){ - item1.checked = true - if(parseFloat(item1.price)>0){ - fine_total_2 = fine_total_2 + parseFloat(item1.price) - } + + //添加精品选装 + changeFine(e) { + if(this.data.fineArr[e.detail.value]=='其他'){ + this.data.fines.push({ + txt:'', + price:'', + }) + this.setData({ + finedIndex:-1, + fines:this.data.fines, + }) + }else{ + let fid = this.data.fineList[e.detail.value].id + let isadd = false + this.data.fines.forEach(item => { + if(item.id == fid){ + isadd = true } }) - }) + if(isadd){ + wx.showToast({ + title: '您已添加过了', + icon: 'none', + duration: 2000 + }) + }else{ + this.data.fineList.forEach(item => { + if(item.id == fid){ + this.data.fines.push({ + id:item.id, + txt:item.title, + price:'', + }) + this.setData({ + finedIndex:-1, + fines:this.data.fines, + }) + } + }) + } + } - this.setData({ - fineList, - fine_total_2, + }, + + //删除精品选装 + delFine(e){ + let that = this + wx.showModal({ + title: '确定删除吗?', + content: '', + confirmText: "确定删除", + confirmColor: "#36afa2", + cancelText: "取消", + cancelColor: "#666", + success(res) { + if (res.confirm) { + let fines = that.data.fines + fines.splice(e.currentTarget.dataset.index, 1) + that.setData({ + fines, + }) + let fine_total = 0 + that.data.fines.forEach(item => { + if(parseFloat(item.price)>0){ + fine_total = fine_total + parseFloat(item.price) + } + }) + that.setData({ + fine_total, + }) + } + } }) }, diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index 75ef5ee..cb135db 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -292,34 +292,24 @@ 精品选装 - 总计：{{fine_total_1+fine_total_2}}元 + 总计：{{fine_total}}元 - - - - - - {{item.price}}元 - - - - - - + + + - 添加 + + 添加 + @@ -509,16 +499,8 @@ 精品选装 - {{fine_total_1+fine_total_2}}元 + {{fine_total}}元 - - - {{item.title}} - - {{item.price}}元 - - - {{item.txt}}