Przeglądaj źródła

Merge branch 'master' of http://git.shengws.com/csx/Vue_New

csx 5 lat temu
rodzic
commit
0b77bfbdc6

+ 2 - 2
config/dev.env.js Wyświetl plik

6
 module.exports = {
6
 module.exports = {
7
   NODE_ENV: '"development"',
7
   NODE_ENV: '"development"',
8
   ENV_CONFIG: '"dev"',
8
   ENV_CONFIG: '"dev"',
9
-  BASE_API: '"http://api.xt.test.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
-  // BASE_API:'"http://localhost:9531"',
9
+  // BASE_API: '"http://api.xt.test.sgjyun.com"', // //http://api.xt.test.sgjyun.com http://112.74.16.180:9527,////'"http://localhost:9529"',
10
+  BASE_API:'"http://localhost:9531"',
11
   SSO_HOST: '"http://testsso.sgjyun.com"',
11
   SSO_HOST: '"http://testsso.sgjyun.com"',
12
   SRCM_HOST: '"http://test1.sgjyun.com"',
12
   SRCM_HOST: '"http://test1.sgjyun.com"',
13
   XT_HOST: '"http://xt.test.sgjyun.com"',
13
   XT_HOST: '"http://xt.test.sgjyun.com"',

+ 2 - 2
config/index.js Wyświetl plik

19
 
19
 
20
     // host: 'xt.test.sgjyun.com',
20
     // host: 'xt.test.sgjyun.com',
21
     // host: 'xt.kuyicloud.com',
21
     // host: 'xt.kuyicloud.com',
22
-    host: 'xt.test.sgjyun.com',
23
-    //host:'localhost',
22
+    // host: 'xt.test.sgjyun.com',
23
+    host:'localhost',
24
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
24
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
25
     autoOpenBrowser: true,
25
     autoOpenBrowser: true,
26
     errorOverlay: true,
26
     errorOverlay: true,

+ 3 - 3
config/sit.env.js Wyświetl plik

4
   BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
4
   BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
5
 
5
 
6
   SSO_HOST: '"https://testsso.sgjyun.com"',
6
   SSO_HOST: '"https://testsso.sgjyun.com"',
7
-  SRCM_HOST: '"https://test1.sgjyun.com"',
8
-  XT_HOST: '"https://xt.test.sgjyun.com"',
7
+  SRCM_HOST: '"http://test1.sgjyun.com"',
8
+  XT_HOST: '"http://xt.test.sgjyun.com"',
9
   MIRCO_MALL_HOST: '"https://mall.test.sgjyun.com"',
9
   MIRCO_MALL_HOST: '"https://mall.test.sgjyun.com"',
10
-  CDM_HOST: '"https://cdm.test.sgjyun.com"',
10
+  CDM_HOST: '"http://cdm.test.sgjyun.com"',
11
 }
11
 }

+ 17 - 17
src/views/layout/components/Sidebar/index.vue Wyświetl plik

37
         :index="index"
37
         :index="index"
38
         @a="b"
38
         @a="b"
39
       ></sidebar-item>
39
       ></sidebar-item>
40
-      <!-- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
41
-        <a :href="CDMWebsit()">
42
-          <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
43
-          <span
44
-            slot="title"
45
-          >慢病管理</span>
46
-        </a>
47
-      </el-menu-item>
40
+     <!--<el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">-->
41
+        <!--<a :href="CDMWebsit()">-->
42
+          <!--<i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>-->
43
+          <!--<span-->
44
+            <!--slot="title"-->
45
+          <!--&gt;慢病管理</span>-->
46
+        <!--</a>-->
47
+      <!--</el-menu-item>-->
48
       <el-menu-item v-if="this.$store.getters.xt_user.scrm_role_exist" index="101">
48
       <el-menu-item v-if="this.$store.getters.xt_user.scrm_role_exist" index="101">
49
         <a :href="SCRMWebsit()">
49
         <a :href="SCRMWebsit()">
50
           <i class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
50
           <i class="icon iconfont icon-pengyou" style="margin-right:4px"></i>
53
           >SCRM</span>
53
           >SCRM</span>
54
         </a>
54
         </a>
55
       </el-menu-item>
55
       </el-menu-item>
56
-      <el-menu-item v-if="this.$store.getters.xt_user.mall_role_exist" index="102">
57
-        <a :href="MircoMallWebsit()">
58
-          <i class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
59
-          <span
60
-            slot="title"
61
-          >微商城</span>
62
-        </a>
63
-      </el-menu-item> -->
56
+      <!--<el-menu-item v-if="this.$store.getters.xt_user.mall_role_exist" index="102">-->
57
+        <!--<a :href="MircoMallWebsit()">-->
58
+          <!--<i class="icon iconfont icon-service_fill" style="margin-right:4px"></i>-->
59
+          <!--<span-->
60
+            <!--slot="title"-->
61
+          <!--&gt;微商城</span>-->
62
+        <!--</a>-->
63
+      <!--</el-menu-item> -->
64
     </el-menu>
64
     </el-menu>
65
-    
65
+
66
   </el-scrollbar>
66
   </el-scrollbar>
67
   <!-- <div class="mianLeft">
67
   <!-- <div class="mianLeft">
68
     <div class="logo">
68
     <div class="logo">