Merge branch '蓝色' into 测试

packageA/invoice/detail.js

@@ -24,7 +24,8 @@ Page({
             label: "发票",
             icon: "icon-tabchanpin",
             model: "#InvoiceList"
-        }]
+        }],
+        sColors: getApp().globalData.http.sColors,
     },
     onLoad(options) {
         getApp().globalData.Language.getLanguagePackage(this, 'E-订单');

packageA/remitVoucher/detail.js

@@ -25,14 +25,15 @@ Page({
 			icon: "icon-tabcaozuojilu1",
 			model: "#remitVoucher"
 		}],
-		tabbarsList: []
+		tabbarsList: [],
+		sColors: getApp().globalData.http.sColors,
 	},
 	onLoad(options) {
 		this.setData({
 			sa_paybillid: options.id
 		});
 		this.getDetail(true);
-    getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
+		getApp().globalData.Language.getLanguagePackage(this, 'E-订单');
 	},
 	/* 获取详情 */
 	getDetail(init = false, show = true) {
@@ -89,7 +90,7 @@ Page({
 			}, {
 				label: "状态",
 				value: getApp().globalData.Language.getMapText(data.status),
-				style:`color:${this.data.sColors[data.status]}`
+				style: `color:${this.data.sColors[data.status]}`
 			}, {
 				label: "经销商编号",
 				value: data.agentnum

packageA/returnOne/detail.js

@@ -10,6 +10,7 @@ Page({
       icon: "icon-tabcaozuojilu1",
       model: "#Product"
     }],
+    sColors: getApp().globalData.http.sColors,
   },
   onLoad(options) {
     sa_aftersalesmagid = options.id;
@@ -81,7 +82,7 @@ Page({
       }, {
         label: "状态",
         value: getApp().globalData.Language.getMapText(data.status),
-        style:`color:${this.data.sColors[data.status]}`
+        style: `color:${this.data.sColors[data.status]}`
       }, {
         label: '来源单号',
         value: data.sonum
@@ -90,7 +91,7 @@ Page({
         value: data.rebate_userate + '%'
       }, {
         label: '是否实物返回',
-        value: data.isitemreturn ? getApp().globalData.Language.getMapText('是')  : getApp().globalData.Language.getMapText('否') 
+        value: data.isitemreturn ? getApp().globalData.Language.getMapText('是') : getApp().globalData.Language.getMapText('否')
       }, {
         label: '定金账户',
         value: data.accountname

utils/defaultColors.js

@@ -1,87 +1,95 @@
 module.exports = {
-    "是": "#F56C6C",
-    "报废": "#999999",
-    "售出": "#67C23A",
+    "ACTIVE": "#67C23A",
+    "上架": "#67C23A",
+    "下架": "#F56C6C",
+    "交期待确认": "#F56C6C",
+    "交期确认": "#3874f6",
+    "代开始": "#3874f6",
     "借出": "#e6a23c",
-    "在库": "#3874f6",
-    "未入账": "#F56C6C",
-    "已入账（非贷款）": "#e6a23c",
-    "已入账（系统）": "#67C23A",
-    "已入账（人工）": "#3874f6",
-    "已入账(非贷款)": "#e6a23c",
-    "已入账(系统)": "#67C23A",
-    "已入账(人工)": "#3874f6",
+    "停用": "#999999",
     "关闭": "#999999",
+    "历史售后": "#999999",
+    "发布": "#67C23A",
+    "发放": "#67C23A",
+    "合作中": "#67C23A",
     "否": "#999999",
+    "启用": "#67C23A",
+    "售中": "#e6a23c",
+    "售出": "#67C23A",
+    "售前": "#3874f6",
+    "售后": "#67C23A",
+    "在库": "#3874f6",
+    "在职": "#67C23A",
+    "复核": "#F56C6C",
+    "多次成交": "#67C23A",
+    "审核": "#e6a23c",
+    "已下达": "#67C23A",
     "已使用": "#67C23A",
-    "未开票": "#F56C6C",
-    "部分开票": "#e6a23c",
+    "已入账(人工)": "#3874f6",
+    "已入账(系统)": "#67C23A",
+    "已入账(非贷款)": "#e6a23c",
+    "已入账（人工）": "#3874f6",
+    "已入账（系统）": "#67C23A",
+    "已入账（非贷款）": "#e6a23c",
+    "已分配": "#333333",
+    "已备货": "#3874f6",
+    "已失败": "#F56C6C",
+    "已完成": "#e6a23c",
+    "已审核": "#67C23A",
     "已开票": "#67C23A",
-    "未核销": "#F56C6C",
-    "部分核销": "#e6a23c",
+    "已成交": "#67C23A",
+    "已截止": "#999999",
+    "已截至": "#999999",
+    "已报备": "#67C23A",
+    "已提交": "#67C23A",
+    "已无效": "#999999",
     "已核销": "#67C23A",
-    "交期确认": "#67C23A",
-    "交期待确认": "#F56C6C",
-    "意向": "#3874f6",
-    "售中": "#e6a23c",
-    "评审通过-已有成品": "rgba(103,194,58,0.5)",
-    "评审通过-暂无成品": "#67C23A",
-    "评审拒绝": "#F56C6C",
-    "评审中": "#e6a23c",
-    "待评审": "#3874f6",
-    "无需评审": "#67C23A",
-    "暂停": "#F56C6C",
-    "代开始": "#3874f6",
-    "待接单": "#999999",
-    "正式": "#67C23A",
-    "历史售后": "#999999",
-    "售后": "#67C23A",
-    "售前": "#3874f6",
-    "已完成": "#67C23A",
+    "已确认(非货款)": "#e6a23c",
+    "已终止": "#999999",
+    "已结案": "#999999",
+    "已读": "#999999",
+    "已转化": "#e6a23c",
+    "已过期": "#999999",
+    "开启": "#67C23A",
+    "待分配": "#3874f6",
     "待处理": "#F56C6C",
+    "待审核": "#3874f6",
+    "待执行": "#3874f6",
     "待指派": "#3874f6",
-    "发放": "#67C23A",
+    "待接单": "#999999",
+    "待评审": "#3874f6",
+    "待跟进": "#3874f6",
+    "意向": "#3874f6",
+    "报备中": "#e6a23c",
+    "报废": "#999999",
+    "提交": "#67C23A",
     "收货": "#67C23A",
+    "新建": "#3874f6",
+    "无需评审": "#67C23A",
+    "是": "#F56C6C",
+    "暂停": "#F56C6C",
+    "暂缓": "#e6a23c",
     "未使用": "#999999",
-    "已过期": "#999999",
+    "未入账": "#F56C6C",
+    "未备货": "#F56C6C",
+    "未开票": "#F56C6C",
+    "未成交": "#3874f6",
+    "未报备": "#3874f6",
+    "未核销": "#F56C6C",
+    "正式": "#67C23A",
     "潜在": "#3874f6",
-    "已分配": "#333333",
-    "待分配": "#3874f6",
-    "已审核": "#67C23A",
-    "待审核": "#3874f6",
+    "禁用": "#999999",
+    "离职": "#999999",
     "结束": "#999999",
-    "已读": "#999999",
     "置顶": "#F56C6C",
-    "发布": "#67C23A",
-    "新建": "#3874f6",
-    "合作中": "#67C23A",
-    "已无效": "#999999",
-    "已转化": "#e6a23c",
+    "评审中": "#e6a23c",
+    "评审拒绝": "#F56C6C",
+    "评审通过-已有成品": "rgba(103,194,58,0.5)",
+    "评审通过-暂无成品": "#67C23A",
     "跟进中": "#67C23A",
-    "待跟进": "#3874f6",
-    "离职": "#999999",
-    "在职": "#67C23A",
-    "停用": "#999999",
-    "启用": "#67C23A",
     "进行中": "#67C23A",
-    "已报备": "#67C23A",
-    "下架": "#F56C6C",
-    "上架": "#67C23A",
-    "已下达": "#67C23A",
-    "已截至": "#999999",
-    "开启": "#67C23A",
-    "已提交": "#67C23A",
-    "复核": "#F56C6C",
-    "审核": "#e6a23c",
-    "提交": "#67C23A",
-    "待执行": "#3874f6",
-    "报备中": "#e6a23c",
-    "未报备": "#3874f6",
-    "已结案": "#999999",
-    "已失败": "#F56C6C",
-    "多次成交": "#67C23A",
-    "已成交": "#67C23A",
-    "未成交": "#3874f6",
-    "已终止": "#999999",
-    "暂缓": "#e6a23c"
+    "部分备货": "#67C23A",
+    "部分开票": "#e6a23c",
+    "部分核销": "#e6a23c",
+    "预提交": "#e6a23c"
 }