逻辑调整

app.json

@@ -25,7 +25,8 @@
         "pages/submission/details",
         "pages/group/index",
         "pages/group/select",
-        "pages/tags/index"
+        "pages/tags/index",
+        "pages/tabbar/workbench/index"
     ],
     "subpackages": [
         {
@@ -121,7 +122,9 @@
                 "clockIn/index",
                 "clockIn/signIn",
                 "contract/modules/objective/setUp",
-                "offers/modules/pettyExpense/update"
+                "offers/modules/pettyExpense/update",
+                "select/brand/select",
+                "select/paytype/select"
             ]
         }
     ],
@@ -147,6 +150,7 @@
         "Yl_Detail": "/components/Yl_Detail/index",
         "Yl_nav": "/components/Yl_nav/index",
         "Yl_filtrate": "/components/Yl_filtrate/index",
+        "Yl_Filtrate1": "/components/Yl_Filtrate1/index",
         "Yl_ListBox": "/components/Yl_ListBox/index",
         "My_card": "/components/My_card/index",
         "My_switch": "/components/My_switch/index",
@@ -178,6 +182,9 @@
             {
                 "pagePath": "pages/tabbar/home/index"
             },
+            {
+                "pagePath": "pages/tabbar/workbench/index"
+            },
             {
                 "pagePath": "pages/tabbar/message/index"
             },

packageA/options/index.js

@@ -88,10 +88,10 @@ Page({
         const pages = getCurrentPages();
         pages[pages.length - 2].selectComponent(item.model || "#Form").setOption(item);
         wx.navigateBack();
-        item.setFun && getApp().globalData.optionFun && getApp().globalData.optionFun({
+        /* item.setFun && getApp().globalData.optionFun && getApp().globalData.optionFun({
             item,
             list: this.data.result.map(v => this.data.list.find(s => s.value == v))
-        });
+        }); */
     },
     onReachBottom() {
         this.getList();

packageA/project/detail.js

@@ -2,23 +2,19 @@ const _Http = getApp().globalData.http;
 Page({
     data: {
         isLeader: false, //是否为负责人
-        tabsActive: 1, //tabs 选中项
+        tabsActive: 0, //tabs 选中项
         sa_projectid: "",
         tabsList: [{
             label: "详细信息",
             icon: "icon-tabxiangxixinxi1"
-        }, {
-            label: "项目评估",
-            icon: "icon-tabxiangmupinggu",
-            model: "#Task"
-        }, {
-            label: "合同",
-            icon: "icon-tabhetong",
-            model: "#Contract"
         }, {
             label: "关联客户",
             icon: "icon-tabkehu",
             model: "#Treaty"
+        }, {
+            label: "联系人",
+            icon: "icon-tablianxiren",
+            model: "#Contacts"
         }, {
             label: "产品配置单",
             icon: "icon-tabchanpin",
@@ -27,22 +23,26 @@ Page({
             label: "报价单",
             icon: "icon-tabbaojiadan",
             model: "#Offers"
-        }, {
-            label: "关联线索",
-            icon: "icon-tabxiansuo",
-            model: "#Clue"
         }, {
             label: "竞争对手",
             icon: "icon-tabjingzhengduishou",
             model: "#Opponent"
         }, {
-            label: "联系人",
-            icon: "icon-tablianxiren",
-            model: "#Contacts"
+            label: "合同",
+            icon: "icon-tabhetong",
+            model: "#Contract"
         }, {
-            label: "跟进动态",
-            icon: "icon-tabgenjinjilu",
-            model: "#Trace"
+            label: "关联线索",
+            icon: "icon-tabxiansuo",
+            model: "#Clue"
+        }, {
+            label: "项目评估",
+            icon: "icon-tabxiangmupinggu",
+            model: "#Task"
+        }, {
+            label: "任务",
+            icon: "icon-tabrenwu",
+            model: "#Work"
         }, {
             label: "附件",
             icon: "icon-tabfujian1",
@@ -52,17 +52,17 @@ Page({
             icon: "icon-tabcaozuojilu1",
             model: "#Record"
         }, {
-            label: "任务",
-            icon: "icon-tabrenwu",
-            model: "#Work"
+            label: "跟进动态",
+            icon: "icon-tabgenjinjilu",
+            model: "#Trace"
         }],
         tabbarList: [],
     },
     onLoad(options) {
         this.setData({
             sa_projectid: options.sa_projectid,
-            isAdmin: wx.getStorageSync('auth').wCustomer.options.some(v => v == "admin"), //是否具有管理权限
-            options: wx.getStorageSync('auth').wCustomer.options, //权限列表
+            isAdmin: wx.getStorageSync('auth').wproject.options.some(v => v == "admin"), //是否具有管理权限
+            options: wx.getStorageSync('auth').wproject.options, //权限列表
         });
         this.getDetail(true)
     },
@@ -196,7 +196,7 @@ Page({
                 {
                     label: "预计完工时间",
                     value: data.enddate_due
-                },{
+                }, {
                     label: "预计签约时间",
                     value: data.signdate_due
                 }, {

packageA/project/modules/contract/index.js

@@ -74,7 +74,7 @@ Component({
         }) {
             let type = 'type4';
             let page = getCurrentPages()[getCurrentPages().length - 1];
-            if (detail.name != '居间协议') type = page.selectComponent("#Tags").data.datatag.some(v => v == '直销') ? 'type2' : 'type3';
+            if (detail.name != '居间协议') type = page.selectComponent("#Tags").data.datatag.some(v => v == '直销') ? 'type3' : 'type2';
             wx.navigateTo({
                 url: `/packageA/contract/add/${type}/index?project=${JSON.stringify([page.data.detail.projectname,[page.data.detail.sa_projectid]])}&sa_projectid=${this.data.sa_projectid}`,
             })

packageA/project/modules/task/list/index.scss

@@ -50,7 +50,6 @@
             display: flex;
             align-items: center;
             justify-content: space-between;
-            height: 50rpx;
             width: 100%;
             box-sizing: border-box;
             padding-right: 20rpx;
@@ -58,8 +57,7 @@
             .tag-box {
                 display: flex;
                 width: 85%;
-                height: 100%;
-
+                flex-wrap: wrap;
                 .tag {
                     height: 40rpx;
                     line-height: 40rpx;
@@ -69,6 +67,8 @@
                     color: #FFFFFF;
                     padding: 0 10rpx;
                     margin-right: 10rpx;
+                    flex-shrink: 0;
+                    margin-bottom: 6rpx;
                 }
             }
 

packageA/publicClue/index.js

@@ -5,7 +5,6 @@ Page({
      * 页面的初始数据
      */
     data: {
-        allot: wx.getStorageSync('auth').worderclue_public.options.some(v => v == 'allot'), //分配
         navList: [{
             label: "全部",
             icon: "icon-webxialaxuanxiangjiantou",
@@ -48,6 +47,7 @@ Page({
     onLoad(options) {
         this.setData({
             insert: wx.getStorageSync('auth').worderclue_public.options.some(v => v == 'insert'), //查询新增权限
+            allot: wx.getStorageSync('auth').worderclue_public.options.some(v => v == 'allot')
         })
         this.getList();
         // this.getTypeList()

project.private.config.json

@@ -5,6 +5,32 @@
         "urlCheck": false
     },
     "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-    "condition": {},
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "通告",
+                    "pathName": "pages/annunciate/index",
+                    "query": "auth=%5B%7B%22systemmoduleid%22%3A303%2C%22sequence%22%3A10%2C%22path%22%3A%22%22%2C%22isdatafollowup%22%3A1%2C%22component%22%3A%22%22%2C%22meta%22%3A%7B%22tables%22%3A%7B%7D%2C%22auth%22%3A%5B%7B%22optionid%22%3A1122%2C%22optionname%22%3A%22%E6%9F%A5%E8%AF%A2%22%2C%22rowindex%22%3A134%2C%22option%22%3A%22read%22%7D%2C%7B%22optionid%22%3A1199%2C%22optionname%22%3A%22%E5%8F%8D%E9%A6%88%22%2C%22rowindex%22%3A135%2C%22option%22%3A%22feedback%22%7D%2C%7B%22optionid%22%3A1279%2C%22optionname%22%3A%22%E5%9B%A2%E9%98%9F%E5%86%85%E9%83%A8%E6%95%B0%E6%8D%AE%E5%88%86%E6%9E%90%22%2C%22rowindex%22%3A305%2C%22option%22%3A%22teamdata%22%7D%2C%7B%22optionid%22%3A1280%2C%22optionname%22%3A%22%E7%BB%8F%E9%94%80%E5%95%86%E6%95%B0%E6%8D%AE%E5%88%86%E6%9E%90%22%2C%22rowindex%22%3A306%2C%22option%22%3A%22agencydata%22%7D%5D%2C%22wedgits%22%3A%5B%7B%22sequence%22%3A1%2C%22wedgit%22%3A%22homenoticelist%22%2C%22wedgitid%22%3A5%2C%22wedgittype%22%3A%22%E9%A6%96%E9%A1%B5%E5%B0%8F%E7%BB%84%E4%BB%B6%22%2C%22wedgitname%22%3A%22%E9%A6%96%E9%A1%B5%E9%80%9A%E5%91%8A%E5%88%97%E8%A1%A8%22%2C%22rowindex%22%3A1%7D%5D%2C%22title%22%3A%22%E9%80%9A%E5%91%8A%22%2C%22grids%22%3A%7B%7D%2C%22hiddenfields%22%3A%5B%5D%7D%2C%22systemappid%22%3A32%2C%22isdatatag%22%3A1%2C%22name%22%3A%22wnotice%22%2C%22rowindex%22%3A24%2C%22isdatateam%22%3A1%7D%5D",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "工作台",
+                    "pathName": "pages/tabbar/workbench/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                },
+                {
+                    "name": "创建直销项目协议",
+                    "pathName": "packageA/contract/add/type3/index",
+                    "query": "",
+                    "launchMode": "default",
+                    "scene": null
+                }
+            ]
+        }
+    },
     "libVersion": "2.28.1"
 }

utils/Http.js

@@ -1,6 +1,6 @@
 // const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
-const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-// const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
+// const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
+const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
 
 let count = null;
 class HTTP {