chenying 4 年之前
父節點
當前提交
11de310c82
共有 4 個文件被更改,包括 7 次插入7 次删除
  1. 1 1
      index.html
  2. 3 3
      src/main.js
  3. 2 2
      src/router/index.js
  4. 1 1
      static/config/index-prod.js

+ 1 - 1
index.html

@@ -12,7 +12,7 @@
   <% }else { %>
     <!-- 开发环境 -->
     <script src="./static/config/index.js"></script>
-    <!-- <script src="./static/plugins/mock-1.0.0-beta3/mock-min.js"></script> -->
+    <script src="./static/plugins/mock-1.0.0-beta3/mock-min.js"></script>
     <!-- <script src="./static/plugins/echarts-3.8.5/echarts.common.min.js"></script>
     <script src="./static/plugins/ueditor-1.4.3.3/ueditor.config.js"></script>
     <script src="./static/plugins/ueditor-1.4.3.3/ueditor.all.min.js"></script>

+ 3 - 3
src/main.js

@@ -15,9 +15,9 @@ Vue.use(VueCookie)
 Vue.config.productionTip = false
 
 // 非生产环境, 适配mockjs模拟数据                 // api: https://github.com/nuysoft/Mock
-// if (process.env.NODE_ENV !== 'production') {
-//   require('@/mock')
-// }
+if (process.env.NODE_ENV !== 'production') {
+  require('@/mock')
+}
 
 // 挂载全局
 Vue.prototype.$http = httpRequest // ajax请求方法

+ 2 - 2
src/router/index.js

@@ -63,12 +63,12 @@ router.beforeEach((to, from, next) => {
     next()
   } else {
     http({
-      url: http.adornUrl('/user-service/menu/nav'),
+      url: http.adornUrl('/user-service/menu/nav'), // user-service
       method: 'get',
       params: http.adornParams()
     }).then(({data}) => {
       if (data && data.code === '200') {
-        fnAddDynamicMenuRoutes(data.data)
+        fnAddDynamicMenuRoutes(data.data.menuList)
         router.options.isAddDynamicMenuRoutes = true
         sessionStorage.setItem('menuList', JSON.stringify(data.data.menuList || '[]'))
         sessionStorage.setItem('permissions', JSON.stringify(data.data.permissions || '[]'))

+ 1 - 1
static/config/index-prod.js

@@ -5,7 +5,7 @@
   window.SITE_CONFIG = {};
 
   // api接口请求地址
-  window.SITE_CONFIG['baseUrl'] = 'http://112.74.164.79/api';
+  window.SITE_CONFIG['baseUrl'] = '';
 
   // cdn地址 = 域名 + 版本号
   window.SITE_CONFIG['domain']  = './'; // 域名