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

config/dev.env.js

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

config/index.js

@@ -19,8 +19,8 @@ module.exports = {
 
     // host: 'xt.test.sgjyun.com',
     // host: 'xt.kuyicloud.com',
-    host: 'xt.test.sgjyun.com',
-    //host:'localhost',
+    // host: 'xt.test.sgjyun.com',
+    host:'localhost',
     port: 9528, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: true,
     errorOverlay: true,

config/sit.env.js

@@ -4,8 +4,8 @@ module.exports = {
   BASE_API: '"http://new_mobile.xt.api.sgjyun.com"',
 
   SSO_HOST: '"https://testsso.sgjyun.com"',
-  SRCM_HOST: '"https://test1.sgjyun.com"',
-  XT_HOST: '"https://xt.test.sgjyun.com"',
+  SRCM_HOST: '"http://test1.sgjyun.com"',
+  XT_HOST: '"http://xt.test.sgjyun.com"',
   MIRCO_MALL_HOST: '"https://mall.test.sgjyun.com"',
-  CDM_HOST: '"https://cdm.test.sgjyun.com"',
+  CDM_HOST: '"http://cdm.test.sgjyun.com"',
 }

src/views/layout/components/Sidebar/index.vue

@@ -37,7 +37,7 @@
         :index="index"
         @a="b"
       ></sidebar-item>
-      <!-- <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
+     <el-menu-item v-if="this.$store.getters.xt_user.cdm_role_exist" index="100">
         <a :href="CDMWebsit()">
           <i class="icon iconfont icon-manbing-xuanzhong" style="margin-right:4px"></i>
           <span
@@ -58,11 +58,11 @@
           <i class="icon iconfont icon-service_fill" style="margin-right:4px"></i>
           <span
             slot="title"
-          >微商城</span>
+          >分销商城</span>
         </a>
-      </el-menu-item> -->
+      </el-menu-item>
     </el-menu>
-    
+
   </el-scrollbar>
   <!-- <div class="mianLeft">
     <div class="logo">