Explorar o código

Merge branch '绿色' into 测试

xiaohaizhao hai 1 ano
pai
achega
e2fc2b543f
Modificáronse 1 ficheiros con 4 adicións e 7 borrados
  1. 4 7
      packageA/salesHourglass/index.js

+ 4 - 7
packageA/salesHourglass/index.js

@@ -273,18 +273,15 @@ Page({
                     "dealTotalCount": data.dealTotalCount, //成交项目数
                     "failTotalCount": data.failTotalCount, //失败项目数
                     "dealRate": (data.dealRate * 100).toFixed(2) + '%', //项目成交率
-
                     "positiveCount": data.positiveCount, //预计成交正偏差项目数合计
-                    "positiveOffsetAmount": CNY((data.totaldealamount || 0 / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //预计成交正偏差金额合计
-
+                    "positiveOffsetAmount": CNY(((data.positiveOffsetAmount || 0) / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //预计成交正偏差金额合计
                     "negativeCount": data.negativeCount, //预计成交负偏差项目数合计
-                    "negativeOffsetAmount": CNY((data.negativeOffsetAmount || 0 / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //预计成交负偏差金额合计
-
+                    "negativeOffsetAmount": CNY(((data.negativeOffsetAmount || 0 ) / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //预计成交负偏差金额合计
                     "offsetCount": data.offsetCount, //预计成交准确项目数
                     "rightRate": (data.rightRate * 100).toFixed(2) + '%', //预测额成交准确率
 
-                    "dealAmount": CNY((data.dealAmount || 0 / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //项目成交金额合计
-                    "signAmount": CNY((data.signAmount || 0 / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //预计签约金额合计
+                    "dealAmount": CNY(((data.dealAmount || 0) / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //项目成交金额合计
+                    "signAmount": CNY(((data.signAmount || 0) / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //预计签约金额合计
                 },
                 comingYear,
                 onRenderBarChart: res.data.length == 0 ? () => {} : () => {