diff --git a/pages/agent/agent-item/index.js b/pages/agent/agent-item/index.js index 6d8387b..50657ba 100644 --- a/pages/agent/agent-item/index.js +++ b/pages/agent/agent-item/index.js @@ -9,7 +9,7 @@ Component({ multipleSlots: true }, properties: { - item: { type: Object, value: null } + item: { type: Object, value: null }, }, data: { kg: app.globalData.kg, diff --git a/pages/agent/agent-item/index.wxml b/pages/agent/agent-item/index.wxml index 6a95153..e582b2b 100644 --- a/pages/agent/agent-item/index.wxml +++ b/pages/agent/agent-item/index.wxml @@ -13,30 +13,36 @@ | 已代卖:{{item.cumulativeWeight}}吨 | - 昨日排队:{{item.yesterdayTotalQuantity}}辆 + 昨日排队:{{item.yesterdayTotalQuantity}}辆 昨日排队:-- - - 代卖费: - {{formate.formatePrice2(item.proxypaySurcharge, kg)}} + + 代卖费: + {{formate.formatePrice2(item.proxypaySurcharge, kg)}} + 纸厂账期: + {{item.foreignPaybackIntervalString}} - + + - - + + {{cateItem.categoryName}} - {{priceItem(cateItem, kg)}} - (已含补贴{{formate.formatePrice2(cateItem.publicSubsidies, kg)}}) + {{priceItem(cateItem, kg)}} + (已含补贴{{formate.formatePrice2(cateItem.publicSubsidies, kg)}}) 暂无报价 @@ -44,12 +50,14 @@ 价格更新:{{item.priceDate}} - {{formate.formatePrice(cateItem.floatingPrice, kg)}} + {{formate.formatePrice(cateItem.floatingPrice, kg)}} 较昨日 - {{formate.formatePrice(-cateItem.floatingPrice, kg)}} + {{formate.formatePrice(-cateItem.floatingPrice, kg)}} 较昨日 @@ -62,13 +70,16 @@ - 我要卖货 + 我要卖货 - - {{item.fold ? '点击收起' : '查看全部' }}({{item.paperCategoryList.length}}) - - + + {{item.fold ? '点击收起' : '查看全部' }}({{item.paperCategoryList.length}}) + + @@ -76,20 +87,20 @@ - function priceItem(item, kg) { - if(kg){ - if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ + function priceItem(item, kg) { + if (kg) { + if (item.publicSubsidies && Number(item.publicSubsidies) > 0) { var price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) return (parseFloat(price)).toFixed(3) + '元/KG' } - return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG' - } else { - if(item.publicSubsidies && Number(item.publicSubsidies) > 0){ + return (parseFloat(item.unitPrice)).toFixed(3) + '元/KG' + } else { + if (item.publicSubsidies && Number(item.publicSubsidies) > 0) { var price = parseFloat(item.unitPrice) + parseFloat(item.publicSubsidies) return (parseFloat(price) * 1000).toFixed(1) + '元/吨' } - return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨' - } - } - module.exports = priceItem; + return (parseFloat(item.unitPrice) * 1000).toFixed(1) + '元/吨' + } + } + module.exports = priceItem; \ No newline at end of file diff --git a/pages/agent/edit/index.js b/pages/agent/edit/index.js index f694b87..2d31e7a 100644 --- a/pages/agent/edit/index.js +++ b/pages/agent/edit/index.js @@ -14,7 +14,8 @@ Page({ safeBottom: app.globalData.safeBottom, form: { paperCategoryId: '', - unitPrice: '' + unitPrice: '', + totalEstimatedWeight:'30' }, timeList: [], cateName: '', @@ -49,6 +50,12 @@ Page({ this.data.vateList.push({plateNumber: '查看更多', fold: 1}) this.setData({ vateList: this.data.vateList }) } + if(this.data.vateList.length>0 && this.data.vateList[0].plateNumber){ + this.setData({ + vehicleList:[{plateNumber: this.data.vateList[0].plateNumber}] + }) + } + }).catch(err => { //异常回调 }) diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index b6057d8..9a86de5 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -23,13 +23,11 @@ 昨日排队:-- - - 代卖费: - {{formate.formatePrice2(factoryDetail.proxypaySurcharge, kg)}} - - - 纸厂账期: - {{factoryDetail.foreignPaybackIntervalString}} + + 代卖费: + {{formate.formatePrice2(factoryDetail.proxypaySurcharge, kg)}} + 纸厂账期: + {{factoryDetail.foreignPaybackIntervalString}}