diff --git a/xtends/statics/index/index.js b/xtends/statics/index/index.js index 0c49d56..f465477 100644 --- a/xtends/statics/index/index.js +++ b/xtends/statics/index/index.js @@ -102,15 +102,15 @@ Scene({ fetchSummaryInfo: function(hide){ getReceiptReport(this.data.form1).then(result => { if(result.data){ - if(result.data.totalOffsiteSettleWeight == 0 && result.data.totalOnsideSettleWeight == 0){ - this.data.percent = 50 - } else if(result.data.totalOffsiteSettleWeight == 0){ - this.data.percent = 0 - } else if(result.data.totalOnsideSettleWeight == 0){ - this.data.percent = 100 - } else { + if(result.data.totalOffsiteSettleWeight > 0 && result.data.totalOnsideSettleWeight > 0){ var totalWeight = math.plus(result.data.totalOffsiteSettleWeight, result.data.totalOnsideSettleWeight) this.data.percent = parseInt(math.times(math.divide(result.data.totalOffsiteSettleWeight, totalWeight), 100)) + } else if(result.data.totalOffsiteSettleWeight > 0){ + this.data.percent = 100 + } else if(result.data.totalOnsideSettleWeight == 0){ + this.data.percent = 0 + } else { + this.data.percent = 50 } this.setData({ reportInfo: result.data, percent: this.data.percent }) } else {