diff --git a/packages/sonpingDetail/expenseDetail.vue b/packages/sonpingDetail/expenseDetail.vue index 684b8e3..e5a9d7e 100644 --- a/packages/sonpingDetail/expenseDetail.vue +++ b/packages/sonpingDetail/expenseDetail.vue @@ -4,23 +4,29 @@ - 费用合计 - ¥{{ details.total }} + 订单费用 + ¥{{ Number.parseFloat(details.total) + details.discount }} 订单折扣 - {{ details.discount && details.discount > 0 ? details.discount +'折' : '无' }} + {{ details.discount && details.discount > 0 ? '- ¥' : '' }}{{ details.discount && details.discount > 0 ? details.discount +'' : '无' }} + + 费用合计 + ¥{{ details.total }} + - + + + @@ -54,7 +60,7 @@ width: 171, key: 'title' },{ - text: '价格', + text: '单价', width: 171, key: 'amount' },{ @@ -107,11 +113,17 @@ details.other.forEach(item => { item.total = new Bigc(item.num).times(item.amount).round(2, 0); }) + details.grading_cost.forEach(item => { + item.total = new Bigc(item.num).times(item.amount).round(2, 0); + }) this.details = details; - this.$nextTick(()=>{ - this.$refs.myCollapse.init(); - this.$refs.myCollapse2.init(); - }); + setTimeout(()=>{ + this.$nextTick(()=>{ + this.$refs.myCollapse.init(); + this.$refs.myCollapse2.init(); + }); + },200) + } } @@ -215,6 +227,9 @@ line-height: 44rpx; white-space: nowrap; } + .text_5_red{ + color: red; + } .text_18 { margin-left: 116rpx; }