diff --git a/pages/agent/agent-item/index.js b/pages/agent/agent-item/index.js index 18d84bf..0343bcb 100644 --- a/pages/agent/agent-item/index.js +++ b/pages/agent/agent-item/index.js @@ -12,7 +12,8 @@ Component({ item: { type: Object, value: null } }, data: { - kg: app.globalData.kg + kg: app.globalData.kg, + cateIndex: 0 }, lifetimes: { // 生命周期函数,可以为函数,或一个在methods段中定义的方法名 @@ -36,15 +37,15 @@ Component({ unflodItem: function(){ this.setData({ ['item.fold']: !this.data.item.fold }) }, - checkTag: function(event){ + checkTag: function(e){ var cateIndex = -1 - if(util.isEmpty(this.data.item.cateIndex)){ - cateIndex = event.currentTarget.dataset.ck - } else if(this.data.item.cateIndex != event.currentTarget.dataset.ck){ - cateIndex = event.currentTarget.dataset.ck + if(util.isEmpty(this.data.cateIndex)){ + cateIndex = e.currentTarget.dataset.ck + } else if(this.data.cateIndex != e.currentTarget.dataset.ck){ + cateIndex = e.currentTarget.dataset.ck } if(cateIndex >= 0){ - this.setData({ ['item.cateIndex']: cateIndex }) + this.setData({ cateIndex }) } }, saleGood: function(e){ @@ -52,15 +53,15 @@ Component({ wx.navigateTo({ url: '/pages/login/index' }) return } - if(util.isEmpty(this.data.item.cateIndex)){ + if(util.isEmpty(this.data.cateIndex)){ util.showToast('请选择一个纸品') return } - if(util.isEmpty(this.data.item.paperCategoryList[this.data.item.cateIndex].unitPrice)){ + if(util.isEmpty(this.data.item.paperCategoryList[this.data.cateIndex].unitPrice)){ util.showToast('该纸品暂无报价,无法卖货') return } - var categoryId = this.data.item.paperCategoryList[this.data.item.cateIndex].categoryId + var categoryId = this.data.item.paperCategoryList[this.data.cateIndex].categoryId wx.navigateTo({ url: '/pages/agent/edit/index?id=' + this.data.item.paperMillId + '&categoryId=' + categoryId }) } } diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml index 77db358..abf4e01 100644 --- a/pages/agent/agent-item/index.wxml +++ b/pages/agent/agent-item/index.wxml @@ -31,10 +31,13 @@ - + {{cateItem.categoryName}} - {{formate.formatePrice2(cateItem.unitPrice, kg)}} + + {{priceItem(cateItem, kg)}} + (已含补贴{{formate.formatePrice2(cateItem.unitPrice, kg)}}) + 暂无报价 @@ -70,4 +73,23 @@ - \ No newline at end of file + + + + function priceItem(item, kg) { + if(kg){ + if(item.uprice && Number(item.uprice) > 0){ + let price = parseFloat(item.unitPrice) + parseFloat(item.uprice) + return (parseFloat(price)).toFixed(3) + '元/KG' + } + return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG' + } else { + if(item.uprice && Number(item.uprice) > 0){ + let price = parseFloat(item.unitPrice) + parseFloat(item.uprice) + return (parseFloat(price) * 1000).toFixed(1) + '元/吨' + } + return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨' + } + } + module.exports = priceItem; + \ No newline at end of file diff --git a/pages/agent/factory-fragment/index.js b/pages/agent/factory-fragment/index.js index 68512cc..ffdb059 100644 --- a/pages/agent/factory-fragment/index.js +++ b/pages/agent/factory-fragment/index.js @@ -120,20 +120,11 @@ Component({ }) } } else { - this.setData({ - finished: true, - requesting: false, - loading: false, - pageNum: 1 - }) + this.setData({ requesting: false, finished: true, loading: false, }) } }).catch(err => { //异常回调 - this.setData({ - requesting: false, - finished: true, - loading: false, - }) + this.setData({ requesting: false, finished: true, loading: false, }) }) }, goattentionIndex: function () {