Merge branch '修改状态颜色'

Eservice/agent/serviceBillDetail/index.wxml

@@ -14,7 +14,7 @@
         </view>
     </view>
     <view class="small"><text class="label">{{language['服务单类型']||'服务单类型'}}:</text>{{orderMainData.servicetype}}</view>
-    <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text>{{orderMainData.status}}</view>
+    <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text><text style="color:{{sColors[orderMainData.status]}};">{{orderMainData.status}}</text></view>
     <view class="small"><text class="label">{{language['开始日期']||'开始日期'}}:</text>{{orderMainData.begdate}}</view>
     <view class="small"><text class="label">{{language['结束日期']||'结束日期'}}:</text>{{orderMainData.enddate}}</view>
     <view class="small"><text class="label">{{language['单据日期']||'单据日期'}}:</text>{{orderMainData.billdate||' --'}}</view>

Eservice/agent/serviceBillList/index.wxml

@@ -16,7 +16,7 @@
                         <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
                         <t-tag class="mr-5" wx:if="{{item.class2}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class2]||item.class2}}</t-tag>
                     </view>
-                    <text>{{language[item.status]||item.status}}</text>
+                    <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
                 </view>
                 <view class="card__body">
                     <view>{{language['服务地址']||'服务地址'}}:{{item.province}}{{item.city}}{{item.county}}{{item.address}}</view>

Eservice/saler/serviceBillDetail/index.wxml

@@ -14,7 +14,7 @@
     </view>
   </view>
   <view class="small"><text class="label">{{language['服务单类型']||'服务单类型'}}:</text>{{orderMainData.servicetype}}</view>
-  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text>{{orderMainData.status}}</view>
+  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text><text style="color:{{sColors[orderMainData.status]}};">{{orderMainData.status}}</text></view>
   <view class="small"><text class="label">{{language['开始日期']||'开始日期'}}:</text>{{orderMainData.begdate}}</view>
   <view class="small"><text class="label">{{language['结束日期']||'结束日期'}}:</text>{{orderMainData.enddate}}</view>
   <view class="small"><text class="label">{{language['单据日期']||'单据日期'}}:</text>{{orderMainData.billdate}}</view>

Eservice/saler/serviceBillList/index.wxml

@@ -23,7 +23,7 @@
           <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
           <t-tag class="mr-5" wx:if="{{item.class2}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class2]||item.class2}}</t-tag>
         </view>
-        <text>{{language[item.status]||item.status}}</text>
+        <text style="color: {{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
       </view>
       <view class="card__body">
         <view>{{language['服务地址']||'服务地址'}}:{{item.province}}{{item.city}}{{item.county}}{{item.address}}</view>

Eservice/workOrder/index.wxml

@@ -31,7 +31,7 @@
         </view>
         <view class="flex-align-center" slot="right">
           <t-tag class="margin-16 leader" wx:for="{{item.isleader}}" size="small" variant="light-outline" theme="primary">{{language['我负责']||'我负责'}}</t-tag>
-          <view class="colorInfo small">
+          <view class="colorInfo small" style="color:{{sColors[item.status]}};">
             {{language[item.status]||item.status}}
           </view>
         </view>

Eservice/workerLeader/serviceBillDetail/index.wxml

@@ -14,7 +14,7 @@
     </view>
   </view>
   <view class="small"><text class="label">{{language['服务单类型']||'服务单类型'}}:</text>{{orderMainData.servicetype}}</view>
-  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text>{{orderMainData.status}}</view>
+  <view class="small"><text class="label">{{language['服务单状态']||'服务单状态'}}:</text><text style="color:{{sColors[orderMainData.status]}};">{{orderMainData.status}}</text></view>
   <view class="small"><text class="label">{{language['开始日期']||'开始日期'}}:</text>{{orderMainData.begdate}}</view>
   <view class="small"><text class="label">{{language['结束日期']||'结束日期'}}:</text>{{orderMainData.enddate}}</view>
   <view class="small"><text class="label">{{language['单据日期']||'单据日期'}}:</text>{{orderMainData.billdate||' --'}}</view>

Eservice/workerLeader/serviceBillList/index.wxml

@@ -16,7 +16,7 @@
             <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
             <t-tag class="mr-5" wx:if="{{item.class1}}" variant="light" shape="round" theme="primary" size="small">{{language[item.class1]||item.class1}}</t-tag>
           </view>
-          <text>{{language[item.status]||item.status}}</text>
+          <text style="color: {{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
         </view>
         <view class="card__body">
           <view>{{language['服务地址']||'服务地址'}}:{{item.province}}{{item.city}}{{item.county}}{{item.address}}</view>

app.js

@@ -37,7 +37,22 @@ App({
                 })
                 wx.setStorageSync('userauth', res.data);
             });
-        };
+            this.globalData.http.sColors = require("./utils/defaultColors")
+            _Http.basic({
+                "classname": "sysmanage.develop.optiontype.optiontype",
+                "method": "optiontypeselect",
+                "content": {
+                    "typename": "statuscolors"
+                }
+            }).then(res => {
+                if (res.code != '1') return;
+                res.data.forEach(v => {
+                    _Http.sColors[v.value] = v.remarks
+                })
+            });
+        } else {
+            this.globalData.http.sColors = require("./utils/defaultColors")
+        }
         if (!wx.getStorageSync('languagecode')) wx.setStorageSync('languagecode', 'ZH');
         this.globalData.Language.getLanguages(wx.getStorageSync('languagecode'));
     },

components/Yl_ReportForms/index.wxml

@@ -2,7 +2,7 @@
   <van-transition show="{{ showAll || item.value }}" name="fade" custom-class="block">
     <navigator url="#" class="box" bindtap="clickItem" data-item="{{item}}">
       <view class="label">{{language[item.label]||item.label}}</view>
-      <view class="value">{{language[item.value]||item.value||'--'}}</view>
+      <view class="value" style="{{item.style||''}}">{{language[item.value]||item.value||'--'}}</view>
       <view class="replenish" catchtap="clickRep" data-item="{{item}}" wx:if="{{item.slot}}">
         <slot name='{{item.slot}}' />
       </view>

packageA/betweenFee/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="#" class="item" wx:for="{{list}}" wx:key="sonum">
     <view class="top">
-        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{set.color(item.status)}}">{{language[item.status]||item.status}}</text>
+        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">
@@ -24,25 +24,4 @@
     </view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#FA8C16';
-                    break;
-                case "提交":
-                    color = '#52C41A';
-                    break;
-                case "新建":
-                    color = '#333333';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

packageA/borrow/detail.wxml

@@ -10,7 +10,7 @@
     </view>
     <view class="exp">{{language['订单类型']||'订单类型'}}：{{detail.type}}</view>
     <view class="exp">{{language['单据日期']||'单据日期'}}：{{detail.billdate || language['暂无']||'暂无'}}</view>
-    <view class="exp">{{language['订单状态']||'订单状态'}}：{{language[detail.status]||detail.status}}</view>
+    <view class="exp">{{language['订单状态']||'订单状态'}}：<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
     <view wx:if="{{detail.sa_contractid}}" class="exp">{{language['借用套数']||'借用套数'}}：{{detail.toolcount}}{{language['套']||'套'}}</view>
     <view class="exp">{{language['订单金额']||'订单金额'}}：{{detail.amount}}{{language['元']||'元'}}</view>
 

packageA/borrow/modules/list/index.wxml

@@ -1,7 +1,7 @@
 <navigator url="/packageA/borrow/detail?id={{item.sa_orderid}}" class="item" wx:for="{{list}}" wx:key="sonum">
     <view class="top">
         {{language['单据日期']||'单据日期'}}：{{item.billdate}}
-        <view style="color: {{set.color(item.status)}};">
+        <view style="color:{{sColors[item.status]}};">
             {{language[item.status]||item.status}}
         </view>
     </view>
@@ -30,24 +30,4 @@
     </view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#FA8C16';
-                    break;
-                case "提交":
-                    color = '#52C41A';
-                    break;
-                case "新建":
-                    color = '#333333';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

packageA/invoice/detail.js

@@ -90,7 +90,8 @@ Page({
         }];
         let list2 = [{
             label: "状态",
-            value: item.status
+            value: item.status,
+            style:`color:${this.data.sColors[item.status]}`
         }, {
             label: "创建人",
             value: item.createby

packageA/invoice/detail.wxml

@@ -4,7 +4,7 @@
 	<view class="num">
 		{{detail.billno}}
 	</view>
-	<view class="exp">{{language['状态']||'状态'}}：{{language[detail.status]||detail.status}}</view>
+	<view class="exp">{{language['状态']||'状态'}}：<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 	<view class="exp">{{language['创建日期']||'创建日期'}}：{{detail.createdate}}</view>
 	<view class="exp">{{language['开票单位']||'开票单位'}}：{{detail.enterprisename|| "--"}}</view>
 	<view class="exp">{{language['备注']||'备注'}}：{{detail.remarks || "--"}}</view>

packageA/invoice/modules/list/index.scss

@@ -17,10 +17,6 @@
         font-size: 28rpx;
         padding-left: 30rpx;
         box-sizing: border-box;
-
-        text{
-            color: var(--assist);
-        }
     }
 
     .content {

packageA/invoice/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="/packageA/invoice/detail?id={{item.sa_invoiceapplyid}}" class="item" wx:for="{{list}}" wx:key="sa_invoiceapplyid">
     <view class="top">
-        {{language['提交日期']||'提交日期'}}：{{item.submitdate || ' --'}} <text>{{language[item.status]||item.status}}</text>
+        {{language['提交日期']||'提交日期'}}：{{item.submitdate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">

packageA/market/detail.js

@@ -178,8 +178,10 @@ Page({
 		})
 		wx.downloadFile({
 			url: item.url,
+			filePath: wx.env.USER_DATA_PATH + '/' + item.document, // 本地自定义的文件名
 			success: function (res) {
-				const filePath = res.tempFilePath
+				console.log(res)
+				const filePath = res.tempFilePath || res.filePath
 				wx.openDocument({
 					filePath: filePath,
 					showMenu: true,

packageA/orderForm/detail.wxml

@@ -13,11 +13,11 @@
 	<view class="exp" wx:if="{{userrole!='经销商'}}">{{language['企业']||'企业'}}：{{detail.enterprisename || ' --'}}</view>
 	<view class="exp" wx:if="{{detail.type=='项目订单'}}">{{language['关联项目']||'关联项目'}}：{{detail.projectname || language['暂无']||'暂无'}}</view>
 	<view class="exp">{{language['订单类型']||'订单类型'}}：{{language[detail.type]||detail.type}}</view>
-	<view class="exp">{{language['订单状态']||'订单状态'}}：{{language[detail.status]||detail.status}}</view>
+	<view class="exp">{{language['订单状态']||'订单状态'}}：<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 	<view class="exp">{{language['单据日期']||'单据日期'}}：{{detail.billdate || language['暂无']||'暂无'}}</view>
 	<view class="exp">{{language['创建日期']||'创建日期'}}：{{detail.createdate}}</view>
-	<view class="exp">{{language['核销状态']||'核销状态'}}：{{language[detail.writeoffstatus]||detail.writeoffstatus}}</view>
-	<view class="exp">{{language['开票状态']||'开票状态'}}：{{language[detail.invoicestatus]||detail.invoicestatus}}</view>
+	<view class="exp">{{language['核销状态']||'核销状态'}}：<text style="color:{{sColors[detail.writeoffstatus]}};">{{language[detail.writeoffstatus]||detail.writeoffstatus}}</text></view>
+	<view class="exp">{{language['开票状态']||'开票状态'}}：<text style="color:{{sColors[detail.invoicestatus]}};">{{language[detail.invoicestatus]||detail.invoicestatus}}</text></view>
 	<van-button custom-class='copy' bindtap="copyItem">{{language['一键复制订单']||'一键复制订单'}}</van-button>
 </view>
 

packageA/orderForm/modules/list/index.wxml

@@ -5,7 +5,7 @@
             <text wx:if="{{language[item.brandName]||item.brandName}}">{{language[item.brandname]||item.brandname}}</text>
             <text wx:if="{{item.tradefield}}">{{language[item.tradefield]||item.tradefield}}</text>
         </view>
-        <view class="statu" style="color: {{set.color(item.status)}};">
+        <view class="statu" style="color: {{sColors[item.status]}};">
             {{language[item.status]||item.status}}
         </view>
     </view>
@@ -40,23 +40,4 @@
     </view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#FA8C16';
-                    break;
-                case "提交":
-                    color = '#52C41A';
-                    break;
-                case "新建":
-                    color = '#333333';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

packageA/orderForm/modules/product/index.js

@@ -61,6 +61,7 @@ Component({
                     } catch (error) {
 
                     }
+                    v.isShowOldPrice = v.marketprice > v.defaultprice
                     v.defaultprice = CNY(v.defaultprice)
                     v.marketprice = CNY(v.marketprice)
                     v.defaultamount = CNY(v.defaultamount)

packageA/orderForm/modules/product/list/index.wxml

@@ -29,7 +29,7 @@
                 </view>
                 <view style="margin-top: 8rpx;">
                     <text class="price">{{item.defaultprice}}{{language['元']||'元'}}</text>
-                    <text class="old-price">{{item.marketprice}}{{language['元']||'元'}}</text>
+                    <text class="old-price" wx:if="{{item.isShowOldPrice}}">{{item.marketprice}}{{language['元']||'元'}}</text>
                 </view>
             </view>
             <view wx:if="{{!disabled}}" class="delete" data-item="{{item}}" catchtap="deleteProduct">

packageA/remitVoucher/detail.js

@@ -88,7 +88,8 @@ Page({
 				value: data.billno
 			}, {
 				label: "状态",
-				value: getApp().globalData.Language.getMapText(data.status)
+				value: getApp().globalData.Language.getMapText(data.status),
+				style:`color:${this.data.sColors[data.status]}`
 			}, {
 				label: "经销商编号",
 				value: data.agentnum

packageA/remitVoucher/detail.wxml

@@ -5,7 +5,7 @@
 	<view class="num">
 		{{detail.billno}}
 	</view>
-	<view class="exp">{{language['状态']||'状态'}}：{{language[detail.status]||detail.status}}</view>
+	<view class="exp">{{language['状态']||'状态'}}：<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 	<view class="exp">{{language['经销商编号']||'经销商编号'}}：{{detail.agentnum}}</view>
 	<view class="exp">{{language['经销商简称']||'经销商简称'}}：{{detail.enterprisename}}</view>
 	<view class="exp">{{language['付款人']||'付款人'}}：{{ detail.payer}}</view>

packageA/remitVoucher/modules/list.wxml

@@ -1,6 +1,6 @@
 <navigator url="/packageA/remitVoucher/detail?id={{item.sa_paybillid}}" class="item" wx:for="{{list}}" wx:key="billno">
     <view class="top">
-        {{language['付款时间']||'付款时间'}} : {{item.paydate || ' --'}} <text style="color:{{set.color(item.status)}}">{{language[item.status]||item.status}}</text>
+        {{language['付款时间']||'付款时间'}} : {{item.paydate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">
@@ -23,24 +23,4 @@
         </view>
     </view>
 </navigator>
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#FA8C16';
-                    break;
-                case "提交":
-                    color = '#52C41A';
-                    break;
-                case "新建":
-                    color = '#333333';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

packageA/returnOne/detail.js

@@ -80,7 +80,8 @@ Page({
         value: data.billdate
       }, {
         label: "状态",
-        value: getApp().globalData.Language.getMapText(data.status)
+        value: getApp().globalData.Language.getMapText(data.status),
+        style:`color:${this.data.sColors[data.status]}`
       }, {
         label: '来源单号',
         value: data.sonum

packageA/returnOne/detail.wxml

@@ -12,7 +12,7 @@
 	<view class="exp">{{language['订单使用返利金占比']||'订单使用返利金占比'}}：{{detail.rebate_userate+'%'}}</view>
 	<view class="exp">{{language['是否实物退回']||'是否实物退回'}}：{{detail.isitemreturn==1?(language['是']||'是'):(language['否']||'否')}}</view>
 	<view class="exp">{{language['订单账户']||'订单账户'}}：{{detail.accountname||"--"}}</view>
-	<view class="exp">{{language['订单状态']||'订单状态'}}：{{language[detail.status]||detail.status}}</view>
+	<view class="exp">{{language['订单状态']||'订单状态'}}：<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status}}</text></view>
 </view>
 
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">

packageA/returnOne/modules/list/index.wxml

@@ -1,7 +1,7 @@
 <navigator url="/packageA/returnOne/detail?id={{item.sa_aftersalesmagid}}" class="item" wx:for="{{list}}" wx:key="sonum">
 	<view class="top">
 		{{language['单据日期']||'单据日期'}}：{{item.billdate}}
-		<view style="color: {{set.color(item.status)}};">
+		<view style="color:{{sColors[item.status]}};">
 			{{language[item.status]||item.status}}
 		</view>
 	</view>
@@ -30,24 +30,4 @@
 	</view>
 </navigator>
 
-<Yl_Empty wx:if="{{list.length==0}}" />
-
-<wxs module="set">
-	module.exports = {
-		color: function (statu) {
-			var color = '#999999';
-			switch (statu) {
-				case "审核":
-					color = '#FA8C16';
-					break;
-				case "提交":
-					color = '#52C41A';
-					break;
-				case "新建":
-					color = '#333333';
-					break;
-			};
-			return color;
-		}
-	}
-</wxs>
+<Yl_Empty wx:if="{{list.length==0}}" />

packageA/toolBill/detail.wxml

@@ -5,7 +5,7 @@
 	<view class="num">
 		{{detail.billno}}
 	</view>
-	<view class="exp">{{language['状态']||'状态'}}：{{language[detail.status]||detail.status || '--'}}</view>
+	<view class="exp">{{language['状态']||'状态'}}：<text style="color:{{sColors[detail.status]}};">{{language[detail.status]||detail.status || '--'}}</text></view>
 	<view class="exp">{{language['单据日期']||'单据日期'}}：{{detail.billdate || '--'}}</view>
 	<view class="exp">{{language['来源单号']||'来源单号'}}：{{detail.sonum || '--'}}</view>
 	<view class="exp">{{language['是否实物返回']||'是否实物返回'}}：{{detail.isitemreturn ? language['是']||'是' : language['否']|| '否'}}</view>

packageA/toolBill/modules/list/index.wxml

@@ -1,6 +1,6 @@
 <navigator url="/packageA/toolBill/detail?id={{item.sa_aftersalesmagid}}" class="item" wx:for="{{list}}" wx:key="sonum">
     <view class="top">
-        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{set.color(item.status)}}">{{language[item.status]||item.status}}</text>
+        {{language['单据日期']||'单据日期'}} : {{item.billdate || ' --'}} <text style="color:{{sColors[item.status]}};">{{language[item.status]||item.status}}</text>
     </view>
     <view class="content">
         <view class="num">
@@ -32,27 +32,3 @@
 </navigator>
 
 <Yl_Empty wx:if="{{list.length==0}}" />
-
-
-<wxs module="set">
-    module.exports = {
-        color: function (statu) {
-            var color = '#999999';
-            switch (statu) {
-                case "审核":
-                    color = '#FA8C16';
-                    break;
-                case "提交":
-                    color = '#52C41A';
-                    break;
-                case "新建":
-                    color = '#333333';
-                    break;
-                case "复核":
-                    color = 'red';
-                    break;
-            };
-            return color;
-        }
-    }
-</wxs>

pages/login/modules/login.js

@@ -1,22 +1,22 @@
 function loginMsg(res) {
-	wx.removeStorageSync('auth')
-	wx.removeStorageSync('userauth');
-	wx.removeStorageSync('siteP');
-	wx.removeStorageSync('banner_list');
-	wx.removeStorageSync('templetList');
-	wx.setStorageSync('isAgree', true)
-	wx.setStorageSync('account_list', res.account_list);
-	if (res.account_list.length == 1) {
+    wx.removeStorageSync('auth')
+    wx.removeStorageSync('userauth');
+    wx.removeStorageSync('siteP');
+    wx.removeStorageSync('banner_list');
+    wx.removeStorageSync('templetList');
+    wx.setStorageSync('isAgree', true)
+    wx.setStorageSync('account_list', res.account_list);
+    if (res.account_list.length == 1) {
         wx.removeStorageSync('userrole')
-		wx.setStorageSync('userrole', res.account_list[0].usertype == 1 ? '业务员' : '经销商');
-		wx.removeStorageSync('userMsg')
-		wx.setStorageSync('userMsg', res.account_list[0])
-		init();
-	} else {
-		wx.redirectTo({
-			url: './selectSite',
-		})
-	}
+        wx.setStorageSync('userrole', res.account_list[0].usertype == 1 ? '业务员' : '经销商');
+        wx.removeStorageSync('userMsg')
+        wx.setStorageSync('userMsg', res.account_list[0])
+        init();
+    } else {
+        wx.redirectTo({
+            url: './selectSite',
+        })
+    }
 }
 
 function init() {
@@ -76,6 +76,18 @@ function init() {
             url: '/pages/tabbar/home/index'
         })
     })
+    _Http.basic({
+        "classname": "sysmanage.develop.optiontype.optiontype",
+        "method": "optiontypeselect",
+        "content": {
+            "typename": "statuscolors"
+        }
+    }).then(res => {
+        if (res.code != '1') return;
+        res.data.forEach(v => {
+            _Http.sColors[v.value] = v.remarks
+        })
+    });
 }
 
 /* 站点数据查询 */

utils/defaultColors.js

@@ -0,0 +1,87 @@
+module.exports = {
+    "是": "#F56C6C",
+    "报废": "#999999",
+    "售出": "#67C23A",
+    "借出": "#e6a23c",
+    "在库": "#3874f6",
+    "未入账": "#F56C6C",
+    "已入账（非贷款）": "#e6a23c",
+    "已入账（系统）": "#67C23A",
+    "已入账（人工）": "#3874f6",
+    "已入账(非贷款)": "#e6a23c",
+    "已入账(系统)": "#67C23A",
+    "已入账(人工)": "#3874f6",
+    "关闭": "#999999",
+    "否": "#999999",
+    "已使用": "#67C23A",
+    "未开票": "#F56C6C",
+    "部分开票": "#e6a23c",
+    "已开票": "#67C23A",
+    "未核销": "#F56C6C",
+    "部分核销": "#e6a23c",
+    "已核销": "#67C23A",
+    "交期确认": "#67C23A",
+    "交期待确认": "#F56C6C",
+    "意向": "#3874f6",
+    "售中": "#e6a23c",
+    "评审通过-已有成品": "rgba(103,194,58,0.5)",
+    "评审通过-暂无成品": "#67C23A",
+    "评审拒绝": "#F56C6C",
+    "评审中": "#e6a23c",
+    "待评审": "#3874f6",
+    "无需评审": "#67C23A",
+    "暂停": "#F56C6C",
+    "代开始": "#3874f6",
+    "待接单": "#999999",
+    "正式": "#67C23A",
+    "历史售后": "#999999",
+    "售后": "#67C23A",
+    "售前": "#3874f6",
+    "已完成": "#67C23A",
+    "待处理": "#F56C6C",
+    "待指派": "#3874f6",
+    "发放": "#67C23A",
+    "收货": "#67C23A",
+    "未使用": "#999999",
+    "已过期": "#999999",
+    "潜在": "#3874f6",
+    "已分配": "#333333",
+    "待分配": "#3874f6",
+    "已审核": "#67C23A",
+    "待审核": "#3874f6",
+    "结束": "#999999",
+    "已读": "#999999",
+    "置顶": "#F56C6C",
+    "发布": "#67C23A",
+    "新建": "#3874f6",
+    "合作中": "#67C23A",
+    "已无效": "#999999",
+    "已转化": "#e6a23c",
+    "跟进中": "#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"
+}

utils/language.js

@@ -27,7 +27,8 @@ class Language {
 
 	async getLanguagePackage(that, setNavBarTitle) {
 		that.setData({
-			language: this.languagePackage || await this.getLanguages(wx.getStorageSync('languagecode'))
+			language: this.languagePackage || await this.getLanguages(wx.getStorageSync('languagecode')),
+			sColors: getApp().globalData.http.sColors
 		})
 		if (setNavBarTitle) this.setNavBarTitle(setNavBarTitle)
 	}