zhoux 2 роки тому
батько
коміт
390fdc0608
3 змінених файлів з 22 додано та 11 видалено
  1. 18 9
      src/config/index.js
  2. 2 1
      src/store/module/user.js
  3. 2 1
      src/view/login/login.vue

+ 18 - 9
src/config/index.js

@@ -28,10 +28,19 @@ export default {
    * @author : 周兴
    * @date   : 2024/3/19 10:49
    */
-  expCp:{
-    cpId:-1,
-    cpName:'东科智云-标准版-体验'
-  },
+  expCp: [{
+    cpId: 2,
+    cpName: '东科智云-标准版-体验',
+    svcCode: 'dkic_b1',
+    svcIp: 'http://127.0.0.1',
+    svcPort: '7001'
+  }, {
+    cpId: 3,
+    cpName: '东科智云-专业版-体验',
+    svcCode: 'dkic_b1',
+    svcIp: 'http://127.0.0.1',
+    svcPort: '7001'
+  }],
   /**
    * @description 需要加载的插件
    */
@@ -345,7 +354,7 @@ export default {
     serviceCategories: '服务类别',
     goodsAttr: '商品属性',
     basicData: '基础资料',
-    freezeStatus:'冻结状态',
+    freezeStatus: '冻结状态',
   },
 
   /**
@@ -543,11 +552,11 @@ export default {
     //供应商
     supplier: 'supplier',
     // 品牌
-    brand:'brand',
+    brand: 'brand',
     //供应商与对象
     supplierAndCustomer: 'supplierAndCustomer',
     //组织机构
-    organization:'organization'
+    organization: 'organization'
   },
   /**
    * @desc   : 收款完成
@@ -610,9 +619,9 @@ export default {
     //办理
     handle: 'handle',
     // 解冻
-    unFreeze:'unFreeze',
+    unFreeze: 'unFreeze',
     // 收款
-    receipt:'receipt',
+    receipt: 'receipt',
     // 退款
     refund: 'refund',
   },

+ 2 - 1
src/store/module/user.js

@@ -305,7 +305,7 @@ export default {
         joinedCpList = data.joinedCpList;
       }
       // 加入体验公司
-      joinedCpList.push(config.expCp);
+      joinedCpList = joinedCpList.union(config.expCp);
       commit('setJoinedCpList', joinedCpList)
       // commit('setLoginType', data.user.sysId)
       // todo 前台保存权限
@@ -342,6 +342,7 @@ export default {
      */
     updateCompany({commit}, company) {
       if(company){
+        console.log('ttt',company)
         commit('setCpId', company.cpId)
         commit('setCpCode', company.cpCode)
         commit('setCpName', company.cpName)

+ 2 - 1
src/view/login/login.vue

@@ -202,8 +202,9 @@ export default {
                 this.joinedCps = res.data.joinedCps;
               }
               // 加入体验公司
-              joinedCpList.push(this.$config.expCp);
+              joinedCpList = joinedCpList.union(this.$config.expCp);
               this.joinedCpList = joinedCpList;
+              console.log('dd',this.$config.expCp,this.joinedCpList)
               this.step = 1;
             } else {
               // 登录后获取信息