Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss_wx_app

app.json

@@ -29,6 +29,8 @@
                 "pages/func-buy/add/add",
                 "pages/func-buy/add-confirm/add-confirm",
                 "pages/func-buy/added/added",
+                "pages/sign/sign",
+                "pages/share/share",
                 "pages/org/org",
                 "pages/staff/staff",
                 "pages/staff/add/add",

package-basic-data/pages/share/share.js

@@ -0,0 +1,66 @@
+// package-basic-data/pages/share/share.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

package-basic-data/pages/share/share.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

package-basic-data/pages/share/share.wxml

@@ -0,0 +1,2 @@
+<!--package-basic-data/pages/share/share.wxml-->
+<text>package-basic-data/pages/share/share.wxml</text>

package-basic-data/pages/share/share.wxss

@@ -0,0 +1 @@
+/* package-basic-data/pages/share/share.wxss */

package-basic-data/pages/sign/sign.js

@@ -0,0 +1,66 @@
+// package-basic-data/pages/sign/sign.js
+Page({
+
+    /**
+     * 页面的初始数据
+     */
+    data: {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad(options) {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide() {
+
+    },
+
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload() {
+
+    },
+
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh() {
+
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom() {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage() {
+
+    }
+})

package-basic-data/pages/sign/sign.json

@@ -0,0 +1,3 @@
+{
+    "usingComponents": {}
+}

package-basic-data/pages/sign/sign.wxml

@@ -0,0 +1,2 @@
+<!--package-basic-data/pages/sign/sign.wxml-->
+<text>package-basic-data/pages/sign/sign.wxml</text>

package-basic-data/pages/sign/sign.wxss

@@ -0,0 +1 @@
+/* package-basic-data/pages/sign/sign.wxss */

pages/company/company.js

@@ -9,6 +9,7 @@
 *******************************************************************************/
 const api = require('@/utils/api.js');
 const Constants = require('@/utils/Constants.js');
+const config = require('@/config/config.js');
 const util = require('@/utils/util');
 
 const app = getApp()
@@ -179,6 +180,18 @@ Page({
                     // 菜单
                     let menuList = res.data.data.menuList
                     if (menuList) {
+                        // 处理操作链接
+                        let filters = menuList.filter(it => it.menuTags)
+                        if (filters && filters.length > 0) {
+                            filters.forEach(t => {
+                                if (t.menuTags.value) {
+                                    let val = JSON.parse(t.menuTags.value)
+                                    if(val.guideUrl == 'knowledge-view' ){
+                                        t.guideUrl = config.knowledge_url + '/' + val.guideUrl + '?appCode=CP-WXP&funId=' + t.funUuid
+                                    }
+                                }
+                            })
+                        }
                          // 处理功能包
                          app.globalData.menus = util.handleMenu(app.globalData.company.funPackage,menuList);
                     }

pages/login/login.js

@@ -256,6 +256,18 @@ Page({
           // 菜单
           let menuList = res.data.data.menuList
           if (menuList) {
+            // 处理操作链接
+            let filters = menuList.filter(it => it.menuTags)
+            if (filters && filters.length > 0) {
+                filters.forEach(t => {
+                    if (t.menuTags.value) {
+                        let val = JSON.parse(t.menuTags.value)
+                        if(val.guideUrl == 'knowledge-view' ){
+                            t.guideUrl = config.knowledge_url + '/' + val.guideUrl + '?appCode=CP-WXP&funId=' + t.funUuid
+                        }
+                    }
+                })
+            }
             app.globalData.menus = util.handleMenu(app.globalData.company.funPackage, menuList);
           }
           // 常用菜单