Browse Source

跳转进入报错

xiaohaizhao 1 week ago
parent
commit
72f04fe2dc

+ 96 - 4
app.js

@@ -37,7 +37,6 @@ App({
                 })
                 wx.setStorageSync('userauth', res.data);
             });
-            this.globalData.http.sColors = require("./utils/defaultColors")
             _Http.basic({
                 "classname": "sysmanage.develop.optiontype.optiontype",
                 "method": "optiontypeselect",
@@ -47,11 +46,9 @@ App({
             }).then(res => {
                 if (res.code != '1') return;
                 res.data.forEach(v => {
-                    _Http.sColors[v.value] = v.remarks
+                    this.globalData.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'));
@@ -78,6 +75,101 @@ App({
         })
     },
     globalData: {
+        sColors: {
+            "ACTIVE": "#67C23A",
+            "上架": "#67C23A",
+            "下架": "#F56C6C",
+            "交期待确认": "#F56C6C",
+            "交期确认": "#3874f6",
+            "代开始": "#3874f6",
+            "借出": "#e6a23c",
+            "停用": "#999999",
+            "关闭": "#999999",
+            "历史售后": "#999999",
+            "发布": "#67C23A",
+            "发放": "#67C23A",
+            "合作中": "#67C23A",
+            "否": "#999999",
+            "启用": "#67C23A",
+            "售中": "#e6a23c",
+            "售出": "#67C23A",
+            "售前": "#3874f6",
+            "售后": "#67C23A",
+            "在库": "#3874f6",
+            "在职": "#67C23A",
+            "复核": "#F56C6C",
+            "多次成交": "#67C23A",
+            "审核": "#e6a23c",
+            "已下达": "#67C23A",
+            "已使用": "#67C23A",
+            "已入账(人工)": "#3874f6",
+            "已入账(系统)": "#67C23A",
+            "已入账(非贷款)": "#e6a23c",
+            "已入账(人工)": "#3874f6",
+            "已入账(系统)": "#67C23A",
+            "已入账(非贷款)": "#e6a23c",
+            "已分配": "#333333",
+            "已备货": "#3874f6",
+            "已失败": "#F56C6C",
+            "已完成": "#e6a23c",
+            "已审核": "#67C23A",
+            "已开票": "#67C23A",
+            "已成交": "#67C23A",
+            "已截止": "#999999",
+            "已截至": "#999999",
+            "已报备": "#67C23A",
+            "已提交": "#67C23A",
+            "已无效": "#999999",
+            "已核销": "#67C23A",
+            "已确认(非货款)": "#e6a23c",
+            "已终止": "#999999",
+            "已结案": "#999999",
+            "已读": "#999999",
+            "已转化": "#e6a23c",
+            "已过期": "#999999",
+            "开启": "#67C23A",
+            "待分配": "#3874f6",
+            "待处理": "#F56C6C",
+            "待审核": "#3874f6",
+            "待执行": "#3874f6",
+            "待指派": "#3874f6",
+            "待接单": "#999999",
+            "待评审": "#3874f6",
+            "待跟进": "#3874f6",
+            "意向": "#3874f6",
+            "报备中": "#e6a23c",
+            "报废": "#999999",
+            "提交": "#67C23A",
+            "收货": "#67C23A",
+            "新建": "#3874f6",
+            "无需评审": "#67C23A",
+            "是": "#F56C6C",
+            "暂停": "#F56C6C",
+            "暂缓": "#e6a23c",
+            "未使用": "#999999",
+            "未入账": "#F56C6C",
+            "未备货": "#F56C6C",
+            "未开票": "#F56C6C",
+            "未成交": "#3874f6",
+            "未报备": "#3874f6",
+            "未核销": "#F56C6C",
+            "正式": "#67C23A",
+            "潜在": "#3874f6",
+            "禁用": "#999999",
+            "离职": "#999999",
+            "结束": "#999999",
+            "置顶": "#F56C6C",
+            "评审中": "#e6a23c",
+            "评审拒绝": "#F56C6C",
+            "评审通过-已有成品": "rgba(103,194,58,0.5)",
+            "评审通过-暂无成品": "#67C23A",
+            "跟进中": "#67C23A",
+            "进行中": "#67C23A",
+            "部分备货": "#67C23A",
+            "部分开票": "#e6a23c",
+            "部分核销": "#e6a23c",
+            "预提交": "#e6a23c"
+        },
         http: new ApiModel, //挂载接口文件
         Language: new Language(), //语言包
         queryPer: require("./utils/queryPermissions"), //权限查询

+ 1 - 1
packageA/invoice/detail.js

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

+ 1 - 1
packageA/remitVoucher/detail.js

@@ -26,7 +26,7 @@ Page({
 			model: "#remitVoucher"
 		}],
 		tabbarsList: [],
-		sColors: getApp().globalData.http.sColors,
+		sColors: getApp().globalData.sColors,
 	},
 	onLoad(options) {
 		this.setData({

+ 1 - 1
packageA/returnOne/detail.js

@@ -10,7 +10,7 @@ Page({
       icon: "icon-tabcaozuojilu1",
       model: "#Product"
     }],
-    sColors: getApp().globalData.http.sColors,
+    sColors: getApp().globalData.sColors,
   },
   onLoad(options) {
     sa_aftersalesmagid = options.id;

+ 1 - 1
pages/tabbar/message/details.wxml

@@ -2,7 +2,7 @@
     <view class="title multi-line">{{language[detailsData.title]||detailsData.title}}</view>
     <view class="time">{{language[detailsData.readdate]||detailsData.readdate}}</view>
     <view class="content multi-line">{{language[detailsData.message]||detailsData.message}}</view>
-    <navigator wx:if="{{detailsData.name}}" class="nav" target='{{detailsData.appid!=appid?"miniProgram":"self"}}' app-id='{{detailsData.appid}}' path="{{detailsData.path+'?auth='+auth+'&userMsg='+userMsg+'&site='+site+'&id='+detailsData.objectid}}" url="{{detailsData.path+'?id='+detailsData.objectid}}" open-type="{{detailsData.openType||'navigate'}}">
+    <navigator version='develop' wx:if="{{detailsData.name}}" class="nav" target='{{detailsData.appid!=appid?"miniProgram":"self"}}' app-id='{{detailsData.appid}}' path="{{detailsData.path+'?auth='+auth+'&userMsg='+userMsg+'&site='+site+'&id='+detailsData.objectid}}" url="{{detailsData.path+'?id='+detailsData.objectid}}" open-type="{{detailsData.openType||'navigate'}}">
         {{language['立即前往']||'立即前往'}}“<text class="work {{detailsData.icon}}" style="color: {{detailsData.color}};" />{{language[detailsData.name]||detailsData.name}}”<text class="text">{{language['查看']||'查看'}} ></text>
     </navigator>
 </view>

+ 1 - 1
utils/language.js

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