diff --git a/commons/js/config.js b/commons/js/config.js index 0efab01..3e5969e 100644 --- a/commons/js/config.js +++ b/commons/js/config.js @@ -1,4 +1,4 @@ -const env = "p"; +const env = "d"; const version = 1, @@ -83,7 +83,7 @@ api = { appCustomersDefeats: 'app/customers/defeats', //战败客户列表 /战败/再战申请 appServices:'app/services', //获取代办服务列表 - appFine:'app/fine', //获取精品赠送列表 + appFine:'app/fine', //获取精品赠送列表 /获取精品选装 materialHomeBiz:'material/home/biz', //店铺海报 materialHomePosters:'material/home/posters', //保存店铺海报 diff --git a/pages/customer/addCard/index.js b/pages/customer/addCard/index.js index 0753ca9..b3c38c8 100644 --- a/pages/customer/addCard/index.js +++ b/pages/customer/addCard/index.js @@ -434,7 +434,7 @@ Page({ getAppCustomersTag(){ _.apiQuery.getAppCustomersTag().then(res => { this.setData({ - taglList:res.data, + taglList:res.data.tags&&res.data.tags.length>0?res.data.tags:[], }) }); }, diff --git a/pages/customer/detail/index.js b/pages/customer/detail/index.js index 211507f..cd01acb 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, @@ -738,17 +738,23 @@ Page({ let params = {}; params['id'] = this.data.id; _.apiQuery.getAppCustomersTag(params).then(res => { - let taglList = res.data - taglList.forEach(itemA => { - itemA.list.forEach(itemB => { - if(itemB.checked){ - itemA.have=true - } + if(res.data.tags&&res.data.tags.length>0){ + let taglList = res.data.tags + taglList.forEach(itemA => { + itemA.list.forEach(itemB => { + if(itemB.checked){ + itemA.have=true + } + }) }) - }) - this.setData({ - taglList, - }) + this.setData({ + taglList, + tab:[ + {"id":1,"title":"跟进记录"}, + {"id":2,"title":"客户画像"}, + ], + }) + } }); }, diff --git a/pages/customer/editCard/index.js b/pages/customer/editCard/index.js index 97d301c..a16bcb3 100644 --- a/pages/customer/editCard/index.js +++ b/pages/customer/editCard/index.js @@ -518,7 +518,7 @@ Page({ params['id'] = this.data.id; _.apiQuery.getAppCustomersTag(params).then(res => { this.setData({ - taglList:res.data, + taglList:res.data.tags&&res.data.tags.length>0?res.data.tags:[], }) }); }, diff --git a/pages/index/index.js b/pages/index/index.js index 8e68ba6..3067f7c 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -61,7 +61,7 @@ Page({ // '', // '', - '新增了小记评论功能；', + // '新增了小记评论功能；', ], }, }, diff --git a/pages/order/edit/index2.js b/pages/order/edit/index2.js index 642d78f..6fdc69e 100644 --- a/pages/order/edit/index2.js +++ b/pages/order/edit/index2.js @@ -59,16 +59,12 @@ Page({ isShowRemarks:false,//意向金备注 srv_total:0,//代办费用 agencyList:[],//代办数组 - fine_total:0,//精品费用 + fine_total_1:0,//精品费用-添加 + fine_total_2:0,//精品费用-选择 //if_fine:false,//精品尊享包 - fines:[ - { - txt:'', - price:'', - }, - ],//精品赠送 + fines:[],//精品赠送 business_type:0,//0未执行到商务政策 1商务政策执行中 2商务政策成功 3商务政策失败 @@ -327,20 +323,46 @@ Page({ } //匹配精品赠送 - 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匹配其他信息*/ + 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, + }) + } + }); + /*end匹配精品赠送*/ }) }, @@ -818,6 +840,15 @@ 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; @@ -1001,14 +1032,14 @@ Page({ this.setData({ ['fines['+e.currentTarget.dataset.index+'].price']:e.detail.value, }) - let fine_total = 0 + let fine_total_1 = 0 this.data.fines.forEach(item => { if(parseFloat(item.price)>0){ - fine_total = fine_total + parseFloat(item.price) + fine_total_1 = fine_total_1 + parseFloat(item.price) } }) this.setData({ - fine_total, + fine_total_1, }) } }, @@ -1165,6 +1196,29 @@ 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) + } + } + }) + }) + + this.setData({ + fineList, + fine_total_2, + }) + }, + //页面相关事件处理函数--监听用户下拉动作 onPullDownRefresh(){ this.getAppCusorderV2() diff --git a/pages/order/edit/index2.wxml b/pages/order/edit/index2.wxml index 10c6e3a..443010c 100644 --- a/pages/order/edit/index2.wxml +++ b/pages/order/edit/index2.wxml @@ -169,8 +169,16 @@ 精品选装 - {{fine_total}}元 + {{fine_total_1+fine_total_2}}元 + + + {{item.title}} + + {{item.price}}元 + + + {{item.txt}} @@ -212,8 +220,8 @@ @@ -231,21 +239,34 @@ 精品选装 - 总计：{{fine_total}}元 + 总计：{{fine_total_1+fine_total_2}}元 - - - - - - - + + + + + + {{item.price}}元 - 添加 + + + + + + + + + + + + 添加 @@ -362,8 +383,16 @@ 精品选装 - {{fine_total}}元 + {{fine_total_1+fine_total_2}}元 + + + {{item.title}} + + {{item.price}}元 + + + {{item.txt}} diff --git a/pages/order/register/index.js b/pages/order/register/index.js index 0d14904..dffb71c 100644 --- a/pages/order/register/index.js +++ b/pages/order/register/index.js @@ -68,19 +68,15 @@ Page({ checktext: '3s', srv_total:0,//代办费用 agencyList:[],//代办数组 - fine_total:0,//精品费用 + fine_total_1:0,//精品费用-添加 + fine_total_2:0,//精品费用-选择 isShowSuccess:false,//是否显示成功提示 isShowContract:false,//是否显示生成合同 //if_fine:false,//精品尊享包 - fines:[ - { - txt:'', - price:'', - }, - ],//精品赠送 + fines:[],//精品赠送 business_type:0,//0未执行到商务政策 1商务政策执行中 2商务政策成功 3商务政策失败 @@ -110,6 +106,7 @@ Page({ this.getAppSeriesBrands() this.getUserInfo() this.getAppCityOncard() + this.getAppFine() }, @@ -611,6 +608,15 @@ 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; @@ -975,14 +981,14 @@ Page({ this.setData({ ['fines['+e.currentTarget.dataset.index+'].price']:e.detail.value, }) - let fine_total = 0 + let fine_total_1 = 0 this.data.fines.forEach(item => { if(parseFloat(item.price)>0){ - fine_total = fine_total + parseFloat(item.price) + fine_total_1 = fine_total_1 + parseFloat(item.price) } }) this.setData({ - fine_total, + fine_total_1, }) } }, @@ -1268,4 +1274,40 @@ Page({ } }, + //获取精品选装 + getAppFine(){ + let params = {}; + params['limbiz'] = 1; + params['page'] = 1; + params['size'] = 100; + _.apiQuery.getAppFine(params).then(res => { + this.setData({ + fineList:res.data.list, + }) + }); + }, + + //精品选装 + 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) + } + } + }) + }) + + this.setData({ + fineList, + fine_total_2, + }) + }, + }) \ No newline at end of file diff --git a/pages/order/register/index.wxml b/pages/order/register/index.wxml index a18c7d7..75ef5ee 100644 --- a/pages/order/register/index.wxml +++ b/pages/order/register/index.wxml @@ -273,8 +273,8 @@ @@ -292,21 +292,34 @@ 精品选装 - 总计：{{fine_total}}元 + 总计：{{fine_total_1+fine_total_2}}元 - - - - - - - + + + + + + {{item.price}}元 - 添加 + + + + + + + + + + + + 添加 @@ -496,8 +509,16 @@ 精品选装 - {{fine_total}}元 + {{fine_total_1+fine_total_2}}元 + + + {{item.title}} + + {{item.price}}元 + + + {{item.txt}}