Merge branch '项目商机详情' into 测试

packageA/project/detail.js

@@ -21,6 +21,14 @@ Page({
         const appAuth = wx.getStorageSync('auth').wproject;
         console.log("appAuth", appAuth)
         let tabsList = [{
+            label: "报价单",
+            icon: "icon-tabbaojiadan",
+            model: "#Offers"
+        }, {
+            label: "合同",
+            icon: "icon-tabhetong",
+            model: "#Contract"
+        }, {
             label: "详细信息",
             icon: "icon-tabxiangxixinxi1"
         }, {
@@ -31,40 +39,40 @@ Page({
             label: "联系人",
             icon: "icon-tablianxiren",
             model: "#Contacts"
-        }, {
+        }]
+
+        if (appAuth.isdatafollowup) tabsList.unshift({
+            label: "跟进动态",
+            icon: "icon-tabgenjinjilu",
+            model: "#Trace"
+        })
+        if (appAuth.options.some(v => v == 'product')) tabsList.push({
             label: "产品配置单",
             icon: "icon-tabchanpin",
             model: "#Product"
-        }, {
-            label: "报价单",
-            icon: "icon-tabbaojiadan",
-            model: "#Offers"
-        }, {
-            label: "竞争对手",
-            icon: "icon-tabjingzhengduishou",
-            model: "#Opponent"
-        }, {
-            label: "合同",
-            icon: "icon-tabhetong",
-            model: "#Contract"
-        }, {
+        })
+        tabsList = tabsList.concat([{
             label: "关联线索",
             icon: "icon-tabxiansuo",
             model: "#Clue"
         }, {
-            label: "项目评估",
-            icon: "icon-tabxiangmupinggu",
-            model: "#Task"
-        }];
+            label: "报备进度",
+            icon: "icon-tabfujian1",
+            model: "#ReportingProgress"
+        }])
         if (appAuth.istask) tabsList.push({
             label: "任务",
             icon: "icon-tabrenwu",
             model: "#Work"
         })
         tabsList = tabsList.concat([{
-            label: "报备进度",
-            icon: "icon-tabfujian1",
-            model: "#ReportingProgress"
+            label: "竞争对手",
+            icon: "icon-tabjingzhengduishou",
+            model: "#Opponent"
+        }, {
+            label: "项目评估",
+            icon: "icon-tabxiangmupinggu",
+            model: "#Task"
         }, {
             label: "附件",
             icon: "icon-tabfujian1",
@@ -74,11 +82,7 @@ Page({
             icon: "icon-tabcaozuojilu1",
             model: "#Record"
         }])
-        if (appAuth.isdatafollowup) tabsList.push({
-            label: "跟进动态",
-            icon: "icon-tabgenjinjilu",
-            model: "#Trace"
-        })
+
         this.setData({
             sa_projectid: options.id,
             isAdmin: appAuth.options.some(v => v == "admin"), //是否具有管理权限