Merge branch '绿色' into 测试

packageA/contract/add/type1/index.js

@@ -82,7 +82,7 @@ Page({
             error: false,
             errMsg: "",
             type: "number",
-            value: "",
+            value: ['HY', 'YOSTEST1'].includes(wx.getStorageSync('userMsg').siteid) ? 7 : "",
             placeholder: "发货日期提醒(天)",
             valueName: "reminddays", //绑定的字段名称
             required: true //必填

packageA/contract/add/type2/index.js

@@ -82,7 +82,7 @@ Page({
             error: false,
             errMsg: "",
             type: "number",
-            value: "",
+            value: ['HY', 'YOSTEST1'].includes(wx.getStorageSync('userMsg').siteid) ? 7 : "",
             placeholder: "发货日期提醒(天)",
             valueName: "reminddays", //绑定的字段名称
             required: true //必填

packageA/contract/add/type3/index.js

@@ -81,7 +81,7 @@ Page({
             error: false,
             errMsg: "",
             type: "number",
-            value: "",
+            value: ['HY', 'YOSTEST1'].includes(wx.getStorageSync('userMsg').siteid) ? 7 : "",
             placeholder: "发货日期提醒(天)",
             valueName: "reminddays", //绑定的字段名称
             required: true //必填

packageA/contract/add/type6/index.js

@@ -88,11 +88,7 @@ Page({
             checking: "base",
             required: true
         }, {
-            label: "发货日期提醒(天)",
-            error: false,
-            errMsg: "",
-            type: "number",
-            value: "",
+         333333 
             placeholder: "发货日期提醒(天)",
             valueName: "reminddays", //绑定的字段名称
             required: true //必填

packageA/salesHourglass/index.js

@@ -253,16 +253,17 @@ Page({
             })
             const comingYear = res.data.array.map(v => {
                 return {
-                    name: getApp().globalData.Language.getMapText('预计成交金额'),
-                    value: (v.dealamount_due / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2) - 0,
+                    name: getApp().globalData.Language.getMapText('预计签约金额'),
+                    value: (v.signamount_due / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2) - 0,
                     date: v.signdate_due
                 }
             }).concat(res.data.array.map(v => {
                 return {
-                    name: getApp().globalData.Language.getMapText('预计签约金额'),
-                    value: (v.signamount_due / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2) - 0,
+                    name: getApp().globalData.Language.getMapText('预计成交金额'),
+                    value: (v.dealamount_due / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2) - 0,
                     date: v.signdate_due
                 }
+
             }))
             console.log("comingYear", comingYear)
             let data = res.data;
@@ -274,16 +275,16 @@ Page({
                     "dealRate": (data.dealRate * 100).toFixed(2) + '%', //项目成交率
 
                     "positiveCount": data.positiveCount, //预计成交正偏差项目数合计
-                    "positiveOffsetAmount": (data.totaldealamount || 0 / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), //预计成交正偏差金额合计
+                    "positiveOffsetAmount": CNY((data.totaldealamount || 0 / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), ''), //预计成交正偏差金额合计
 
                     "negativeCount": data.negativeCount, //预计成交负偏差项目数合计
-                    "negativeOffsetAmount": (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": (data.dealAmount || 0 / (wx.getStorageSync('languagecode') == 'ZH' ? 10000 : 1000)).toFixed(2), //项目成交金额合计
-                    "signAmount": (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 ? () => {} : () => {

project.private.config.json

@@ -18,5 +18,5 @@
             ]
         }
     },
-    "libVersion": "3.6.1"
+    "libVersion": "3.7.1"
 }