Merge branch 'bug' into 测试

packageA/opponent/detail.js

@@ -18,31 +18,32 @@ Page({
         }, {
             label: "参与项目",
             icon: "icon-tabxiangmu"
-        }, {
-            label: "地址管理",
-            icon: "icon-tabdizhi"
         }, {
             label: "联系人",
             icon: "icon-tablianxiren"
         }, {
-            label: "操作记录",
-            icon: "icon-tabcaozuojilu1"
+            label: "地址管理",
+            icon: "icon-tabdizhi"
         }, {
             label: "附件",
             icon: "icon-tabfujian1"
+        }, {
+            label: "操作记录",
+            icon: "icon-tabcaozuojilu1"
         }];
-        if (appAuth.isdatafollowup) tabsList.splice(4, 0, {
-            label: "跟进动态",
-            icon: "icon-tabgenjinjilu"
-        })
-        if (appAuth.istask) tabsList.push({
+        if (appAuth.istask) tabsList.splice(4, 0, {
             label: "任务",
             icon: "icon-tabrenwu",
             model: "#Work"
         })
+        if (appAuth.isdatafollowup) tabsList.splice(4, 0, {
+            label: "跟进动态",
+            icon: "icon-tabgenjinjilu"
+        })
         this.setData({
             sa_competitorid: options.id,
             isAdmin: appAuth.options.some(v => v == "admin"), //是否具有管理权限
+            options: appAuth.options, //是否具有管理权限
             tabsList,
             appAuth
         })

packageA/publicCustomer/detail.js

@@ -11,26 +11,30 @@ Page({
     },
     onLoad(options) {
         const appAuth = wx.getStorageSync('auth').wPublicCustomer;
-        console.log("appAuth", appAuth)
-        let tabsList = [{
-            label: "详细信息",
-            icon: "icon-tabxiangxixinxi1"
-        }, {
+        /* {
             label: "关联线索",
             icon: "icon-tabxiansuo",
             model: "#Clue"
-        }, {
-            label: "项目商机",
-            icon: "icon-tabxiangmu",
-            model: "#Project"
+        }, */
+        let tabsList = [{
+            label: "详细信息",
+            icon: "icon-tabxiangxixinxi1"
+        },  {
+            label: "联系人",
+            icon: "icon-tablianxiren",
+            model: "#Contacts"
         }, {
             label: "客户地址",
             icon: "icon-tabdizhi",
             model: "#Address"
         }, {
-            label: "联系人",
-            icon: "icon-tablianxiren",
-            model: "#Contacts"
+            label: "开票信息",
+            icon: "icon-tabbaojiadan",
+            model: "#Financing"
+        }, {
+            label: "项目商机",
+            icon: "icon-tabxiangmu",
+            model: "#Project"
         }, {
             label: "报价单",
             icon: "icon-tabbaojiadan",
@@ -47,10 +51,6 @@ Page({
             label: "银行卡信息",
             icon: "icon-tabchanpin",
             model: "#Bankcard"
-        }, {
-            label: "开票信息",
-            icon: "icon-tabbaojiadan",
-            model: "#Financing"
         }];
         if (appAuth.isdatafollowup) tabsList.splice(1, 0, {
             label: "跟进动态",
@@ -63,13 +63,13 @@ Page({
             model: "#Work"
         })
         tabsList = tabsList.concat([{
-            label: "操作",
-            icon: "icon-tabcaozuojilu1",
-            model: "#Record"
-        }, {
             label: "附件",
             icon: "icon-tabfujian1",
             model: "#Files"
+        }, {
+            label: "操作",
+            icon: "icon-tabcaozuojilu1",
+            model: "#Record"
         }])
         this.setData({
             sa_customersid: options.id,

packageA/setclient/detail.js

@@ -24,21 +24,21 @@ Page({
             label: "详细信息",
             icon: "icon-tabxiangxixinxi1"
         }, {
-            label: "关联线索",
-            icon: "icon-tabxiansuo",
-            model: "#Clue"
-        }, {
-            label: "项目商机",
-            icon: "icon-tabxiangmu",
-            model: "#Project"
+            label: "联系人",
+            icon: "icon-tablianxiren",
+            model: "#Contacts"
         }, {
             label: "客户地址",
             icon: "icon-tabdizhi",
             model: "#Address"
         }, {
-            label: "联系人",
-            icon: "icon-tablianxiren",
-            model: "#Contacts"
+            label: "开票信息",
+            icon: "icon-tabbaojiadan",
+            model: "#Financing"
+        }, {
+            label: "项目商机",
+            icon: "icon-tabxiangmu",
+            model: "#Project"
         }, {
             label: "报价单",
             icon: "icon-tabbaojiadan",
@@ -56,9 +56,9 @@ Page({
             icon: "icon-tabchanpin",
             model: "#Bankcard"
         }, {
-            label: "开票信息",
-            icon: "icon-tabbaojiadan",
-            model: "#Financing"
+            label: "关联线索",
+            icon: "icon-tabxiansuo",
+            model: "#Clue"
         }];
         if (appAuth.isdatafollowup) tabsList.unshift({
             label: "跟进动态",
@@ -71,13 +71,13 @@ Page({
             model: "#Work"
         })
         tabsList = tabsList.concat([{
-            label: "操作",
-            icon: "icon-tabcaozuojilu1",
-            model: "#Record"
-        }, {
             label: "附件",
             icon: "icon-tabfujian1",
             model: "#Files"
+        }, {
+            label: "操作",
+            icon: "icon-tabcaozuojilu1",
+            model: "#Record"
         }])
         this.setData({
             sa_customersid: options.id,