---

pages/agent/detail/item-money-info/money-info.js

@@ -56,29 +56,42 @@ Component({
         firstMoneyStringTip: firstLeft + '=' + rightJsdj + '×' + rightJsjz + '×' + rightFkbl + rightDmf + '×' + rightJz
       })
       //尾款金额toptip提示
-      var secondLeft = '结算单价x结算重量-首笔货款金额' + firstFkbl + '+' + (this.data.isShowtotalOtherAmount == false ? 'isShowtotalOtherAmount' : '') + '+返还补贴+调节费'
+      console.log(1)
+      var secondLeft = '结算单价x结算重量-首笔货款金额' + firstFkbl + '+' + (this.data.isShowtotalOtherAmount == false ? '纸厂补贴与扣款' : '') + '+返还补贴+调节费'
       if (this.data.item.unitPrice) {
         var secondJsdj = (math.times(this.data.item.unitPrice, 1000) + '元/吨')
-      }else{
-        var secondJsdj=''
+      } else {
+        var secondJsdj = '0'
       }
+      console.log(2)
       if (this.data.item.weightnoteInfo.settleWeight) {
         var secondJszl = (math.divide(this.data.item.weightnoteInfo.settleWeight, 1000) + '吨')
-      }else{
-        var secondJszl=''
+      } else {
+        var secondJszl = '0'
       }
+      console.log(3)
       if (this.data.item.weightnoteInfo.netWeight) {
         var secondJsjz = (math.divide(this.data.item.weightnoteInfo.netWeight, 1000) + '吨')
+      } else {
+        var secondJsjz = '0'
+      }
+      if( this.data.item.preSettleMoney){
+        var secondSbhkje = this.data.item.preSettleMoney>0?'+'+this.data.item.preSettleMoney:this.data.item.preSettleMoney
       }else{
-        var secondJsjz=''
+        var secondSbhkje='+0元'
+      }
+     
+      var secondzcbtykk = (this.data.isShowtotalOtherAmount == true ? '' : (this.data.item.totalOtherAmount > 0 ? '+' + this.data.item.totalOtherAmount : '' + this.data.item.totalOtherAmount))+'元'
+      if (this.data.item.unitRefundSubsidy) {
+        var secondbtdj = (math.times(this.data.item.unitRefundSubsidy, 1000) + '元/吨')
+
+      } else {
+        var secondbtdj = '0元/吨'
       }
 
-      var secondSbhkje = this.data.item.preSettleMoney + ''
-      var secondzcbtykk = this.data.isShowtotalOtherAmount == true ? '' : (this.data.item.totalOtherAmount > 0 ? '+' + this.data.item.totalOtherAmount : '' + this.data.item.totalOtherAmount)
-      var secondbtdj = (math.times(this.data.item.unitRefundSubsidy, 1000) + '元/吨')
-      var secondfhbt = this.data.itemrefundSubsidy == 0 ? '' : (this.data.itemrefundSubsidy > 0 ? '+' + this.data.itemrefundSubsidy : this.data.itemrefundSubsidy)
+      var secondfhbt = (this.data.itemrefundSubsidy == 0 ? '' : (this.data.itemrefundSubsidy > 0 ? '+' + this.data.itemrefundSubsidy :(this.data.itemrefundSubsidy<0?this.data.itemrefundSubsidy:'0') ))+'元'
       this.setData({
-        secondMoneyStringTip: secondLeft + '=' + secondJsdj + '×' + secondJszl + '-' + secondSbhkje + rightFkbl + '+' + secondzcbtykk + '+' + secondbtdj + '×' + secondJsjz + secondfhbt
+        secondMoneyStringTip: secondLeft + '=' + secondJsdj + '×' + secondJszl + secondSbhkje  + secondzcbtykk + '+' + secondbtdj + '×' + secondJsjz +'+'+ secondfhbt
       })
 
       console.log(this.data.firstMoneyStringTip)