1、修改切换公司

mixins/index.js

@@ -899,7 +899,6 @@ module.exports = {
       var currentPage = pages[pages.length - 1];
       let formData = this.data.formData
       let formValue = app.globalData[currentPage.route];
-      console.log('ttt',formData , formValue ,formData == formValue);
       if (formValue && formData && formData != formValue) {
         Dialog.confirm({
           message: '是否加载缓存数据',

pages/company/company.js

@@ -37,34 +37,31 @@ Page({
    * @author : 姜永辉
    */
     loadCompanyData() {
-        let _this = this
-        api.request(Constants.SYS_OPENID_API + 'company/select_company/' + app.globalData.openid, 'POST', null).then(res => {
-            if (res.data.code == Constants.SUCESS_CODE) {
-                let list = res.data.data
-                let templist = [{
-                    cpId: 2,
-                    cpName: '东科智云-标准版-体验',
-                    svcCode: 'dkic_b1',
-                    openid:'dktest',
-                    svcIp: 'http://127.0.0.1',
-                    gradeCode: 'STD',
-                    svcPort: '7001'
-                }, {
-                    cpId: 3,
-                    cpName: '东科智云-专业版-体验',
-                    svcCode: 'dkic_b1',
-                    gradeCode: 'PRO',
-                    openid:'dktestpro',
-                    svcIp: 'http://127.0.0.1',
-                    svcPort: '7001'
-                }]
-
-
-                this.setData({
-                    companyList: list.concat(templist)
-                })
+        let list = []
+        // 如果当前是体验企业，那么就不用查，直接用缓存中的数据
+        let openId = app.globalData.openid
+        if (openId == Constants.testCpCodes.std_test ||
+            openId == Constants.testCpCodes.pro_test) {
+            console.log('app.globalData1', app.globalData);
+            if (app.globalData.company_social && app.globalData.user_social) {
+                let item = { ...app.globalData.company_social }
+                item.openid = app.globalData.user_social.userWxId
+                list.push(item)
             }
-        })
+            this.setData({
+                companyList: list.concat(Constants.testCpList)
+            })
+        } else {
+            api.request(Constants.SYS_OPENID_API + 'company/select_company/' + openId, 'POST', null).then(res => {
+                if (res.data.code == Constants.SUCESS_CODE) {
+                    let list = res.data.data
+
+                    this.setData({
+                        companyList: list.concat(Constants.testCpList)
+                    })
+                }
+            })
+        }
     },
 
     /**
@@ -73,7 +70,6 @@ Page({
      * @author : 姜永辉
      */
     updateCompanyID(item) {
-        let _this = this
         let param = {
             openid: app.globalData.openid,
             cpId: item.cpId
@@ -97,11 +93,22 @@ Page({
     clickCompany(e) {
         // 点击企业时候反写当前公司
         let item = e.currentTarget.dataset.item
+        console.log('item', item, app.globalData.openid,app.globalData.user_social);
         if (item.cpId == 2 || item.cpId == 3) {
             this.freeClick(item)
         } else {
-            this.updateCompanyID(item)
-        }        
+            // 公司之间切换
+            let openId = app.globalData.openid
+            if (openId != Constants.testCpCodes.std_test &&
+                openId != Constants.testCpCodes.pro_test) {
+                this.updateCompanyID(item)
+            } else {
+                // 体验公司切换到正常公司
+                wx.reLaunch({
+                    url: '../../pages/welcome/welcome',
+                })
+            }
+        }
     },
 
     /**
@@ -110,6 +117,8 @@ Page({
      * @author : 姜永辉
      */
     getTokenPromise() {
+        // 先删除掉之前的token
+        app.globalData.token = null;
         return new Promise((resolve, reject) => {
             api.request(Constants.SYS_OPENID_API + 'oauth/feign/wx/token', 'POST',
                 { 'userWxid': app.globalData.openid }).then(res => {
@@ -119,6 +128,69 @@ Page({
     },
 
     /**
+    * @desc : 登录后获取数据
+    * @date : 2022/5/12 13:49
+    * @author : 周兴
+    */
+    getInfoAfterLogin() {
+        api.request('mdm-server/mst/staff/get_info_after_login', 'POST',
+            {
+                'appCode': Constants.APP_CODE,
+                'cpId': app.globalData.company.cpId,
+                'userId': app.globalData.user.userId
+            }).then(res => {
+                if (res.data.code === Constants.SUCESS_CODE) {
+                    console.log('red', res);
+                    // 员工
+                    let staff = res.data.data.staff
+                    if (staff && staff.staffId) {
+                        app.globalData.user.staffId = staff.staffId
+                        app.globalData.user.staffCode = staff.staffCode
+                        app.globalData.user.staffName = staff.staffName
+                        app.globalData.user.roleIds = staff.roleIds
+                        app.globalData.user.orgId = staff.orgId
+                        app.globalData.user.orgName = staff.orgName
+                        app.globalData.user.defaultWhName = staff.defaultWhName
+                        app.globalData.user.defaultWhId = staff.defaultWhId
+
+                        // 调转主页--注意有场景值的情况 
+                        if (this.data.scene) {
+                            wx.reLaunch({
+                                url: '../../pages/home-page/home-page?scene=' + this.data.scene,
+                            })
+                        } else {
+                            wx.reLaunch({
+                                url: '../../pages/home-page/home-page',
+                            })
+                        }
+                    }
+                    // 菜单
+                    let menuList = res.data.data.menuList
+                    if (menuList) {
+                        app.globalData.menus = menuList
+                    }
+                    // 常用菜单
+                    let comMenuList = res.data.data.comMenuList
+                    if (comMenuList) {
+                        app.globalData.comMenuList = comMenuList
+                    }
+                    // 系统参数
+                    let setting = res.data.data.settingValue
+                    if (setting) {
+                        app.globalData.setting = JSON.parse(setting.setting.value)
+                        // console.log('setting', app.globalData.setting[Constants.settingCode.IVT001]);
+                    }
+                    // 系统字典
+                    let dataKindList = res.data.data.dataKindList
+                    if (dataKindList) {
+                        app.globalData.dataKindList = dataKindList
+                    }
+                }
+            })
+        console.log('app.globalData', app.globalData);
+    },
+
+    /**
     * @desc : 免费体验
     * @date : 2022/5/12 13:49
     * @author : 姜永辉
@@ -130,19 +202,40 @@ Page({
         //  调用接口
         _this.getTokenPromise().then(res => {
             if (res.data.code === Constants.SUCESS_CODE) {
-                app.globalData.user = res.data.data
-                app.globalData.token = res.data.data.accessToken
-                if (res.data.data.company == undefined
-                    || res.data.data.company.cpId == undefined) {
+                let data = res.data.data;
+                // 先存放之前的用户信息，便于切换回来
+                if (data.userWxId == 'std_test' || data.userWxId == 'pro_test') {
+                    app.globalData.company_social = { ...app.globalData.company }
+                    app.globalData.user_social = { ...app.globalData.user }
+                }
+                console.log('app.company', app.globalData);
+                // 记录登录的缓存
+                app.globalData.company = data.company
+
+                app.globalData.user = {
+                    userId: data.userId,
+                    userWxId: data.userWxId,
+                    userName: data.userName,
+                    userPhone: data.userPhone
+                }
+                app.globalData.token = data.accessToken
+                // 读取后台设置的url
+                if (data.company && data.company.svcIp && data.company.svcPort) {
+                    app.globalData.URI = data.company.svcIp + ':' + data.company.svcPort
+                }
+                if (data.company == undefined
+                    || data.company.cpId == undefined) {
                     // 调转选择公司
                     wx.reLaunch({
                         url: '../../pages/company/company',
                     })
                 } else {
+                    // // 接口登录后获取数据
+                    _this.getInfoAfterLogin();
                     // 调转主页
-                    wx.reLaunch({
-                        url: '../../pages/home-page/home-page',
-                    })
+                    // wx.reLaunch({
+                    //     url: '../../pages/home-page/home-page',
+                    // })
                 }
             }
         })

utils/Constants.js

@@ -5,7 +5,7 @@ module.exports = {
   //一页条数
   PAGE_SIZE: 5,
   //最大条数（导出excel使用）
-  MAX_PAGE_SIZE:100000,
+  MAX_PAGE_SIZE: 100000,
   // 成功的code
   SUCESS_CODE: 200,
   // 默认语言
@@ -43,9 +43,9 @@ module.exports = {
   },
 
   // 角色
-  role:{
+  role: {
     // 店长
-    shopKeeper:'PR00001'
+    shopKeeper: 'PR00001'
   },
 
   // 查询条件组件类型
@@ -109,6 +109,33 @@ module.exports = {
     make: 'PU10000003',
   },
 
+  // 体验企业编码
+  testCpCodes:{
+    // 标准版企业
+    std_test:'std_test',
+    // 专业版企业
+    pro_test:'pro_test'
+  },
+
+  // 体验企业信息
+  testCpList: [{
+    cpId: 2,
+    cpName: '东科智云-标准版-体验',
+    svcCode: 'dkic_b1',
+    openid: 'std_test',
+    svcIp: 'http://127.0.0.1',
+    gradeCode: 'STD',
+    svcPort: '7001'
+  }, {
+    cpId: 3,
+    cpName: '东科智云-专业版-体验',
+    svcCode: 'dkic_b1',
+    gradeCode: 'PRO',
+    openid: 'pro_test',
+    svcIp: 'http://127.0.0.1',
+    svcPort: '7001'
+  }],
+
   // 表单类型
   gradeCode: {
     // 标准版
@@ -176,9 +203,9 @@ module.exports = {
     returnPayment: '收付款类型-退付款',
   },
   //库存调整
-  inventoryAdjustment:{
-    warehouse:'调整类型-仓库调整',
-    batchNumber:'调整类型-非标号调整',
+  inventoryAdjustment: {
+    warehouse: '调整类型-仓库调整',
+    batchNumber: '调整类型-非标号调整',
   },
 
   // 入库类型
@@ -381,9 +408,9 @@ module.exports = {
     // 销售单明细表
     orderDetailReport: 'order-detail-report',
     // 采购明细表
-    purDetailReport:'pur-detail-report',
+    purDetailReport: 'pur-detail-report',
     //客户收款明细表
-    cusReceiptDetailReport:'cus-receipt-report',
+    cusReceiptDetailReport: 'cus-receipt-report',
     // 销售订单
     order: 'order',
     // 客户收款

utils/api.js

@@ -65,7 +65,9 @@ function wxRequest(url, requestType, params) {
     if (app.globalData.user) {
       app.globalData.user.openId = openId
       // 请求的Authorization 
-      header['Authorization'] = "Bearer " + app.globalData.token
+      if(app.globalData.token){
+        header['Authorization'] = "Bearer " + app.globalData.token
+      }
     }
     // 语言
     header['i18n'] = constants.lan