Browse Source

提交新版本

lxh 2 months ago
parent
commit
2534dcc650
2 changed files with 2 additions and 6 deletions
  1. 2 2
      common/service/config.service.js
  2. 0 4
      pages/index/index.vue

+ 2 - 2
common/service/config.service.js

@@ -3,14 +3,14 @@ let BASE_URL = "";
 if (process.env.NODE_ENV == "development") {
   BASE_URL = "http://182.92.126.35:9999"; // 开发环境
 } else {
-  BASE_URL = "http://10.246.95.4:9999"; // 布尔台
+  // BASE_URL = "http://10.246.95.4:9999"; // 布尔台
   // BASE_URL = "http://10.248.135.10:9999"; // 大柳塔进
   // BASE_URL = "http://10.248.135.121:9999"; // 活鸡兔井
   // BASE_URL = "http://10.246.63.125:9999"; // 寸草塔二矿
   // BASE_URL = "http://10.246.183.35:9999"; // 乌兰木伦
   // BASE_URL = "http://10.120.120.164:9999"; // 察哈素
   // BASE_URL = "http://182.92.126.35:9999"; // 生产环境
-    // BASE_URL = "http://192.168.146.129:9999"; // 大海则
+    BASE_URL = "http://192.168.146.129:9999"; // 大海则
 }
 let staticDomainURL = BASE_URL + "/sys/common/static";
 

+ 0 - 4
pages/index/index.vue

@@ -185,12 +185,8 @@ export default {
   watch: {
     permission: {
       handler(newV, oldV) {
-<<<<<<< HEAD
-        this.PageCur = newV[0].component
-=======
         debugger;
         if (newV != null && newV != "") this.PageCur = newV[0].component;
->>>>>>> 0eecb89dbe2491a293d41c60d90594fb93f14792
       },
       immediate: true,
     },