Explorar o código

Merge branch 'develop_yh40' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh40

chenrui hai 1 ano
pai
achega
d836da3d49
Modificáronse 3 ficheiros con 4 adicións e 3 borrados
  1. 1 1
      public/version.json
  2. 2 1
      src/utils/util.js
  3. 1 1
      vue.config.js

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.2.39",
+    "version": "2.2.40",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 2 - 1
src/utils/util.js

@@ -286,7 +286,8 @@ export function getAuthPriceCode (config, router, store) {
     
     // 从所有的权限菜单中查找当前权限code对应的权限菜单数据
     const authNode = treeFind(authTree,(item)=>item.code == authCode)
-    // console.log(authNode)
+    // console.log(authNode,authCode)
+    if(!authNode){return []}
     if(!authNode.permission){return []}
     // 从找到的对应权限菜单数据中判断当前调用接口的url是否存在,这里和权限菜单中的后台权限code比较
     const hasReqUrl = authNode.permission.split(',').find(item => url.replace(/\//g,'_').indexOf(item)>=0)

+ 1 - 1
vue.config.js

@@ -108,7 +108,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.2.111/ocs-admin',
+        // target: 'http://192.168.2.113:8660/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
         target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,