fix

hookehuyr
Commit 203a0acac8c5a48b18b07b97e59fd233c675e0c8 203a0aca 1 parent e546fcf5
Showing 8 changed files with 153 additions and 55 deletions
package-lock.json
package.json
public/index.html
src/App.vue
src/main.js
src/subpage/main.js
src/views/Home.vue
vue.config.js
--- a/package-lock.json
View file @203a0ac
+++ b/package-lock.json
View file @203a0ac
@@ -1655,6 +1655,7 @@
       "version": "6.6.2",
       "resolved": "http://registry.npm.taobao.org/ajv/download/ajv-6.6.2.tgz",
       "integrity": "sha1-ys7M9HS/P8POOxR0Q3EaJAY8ww0=",
+      "dev": true,
       "requires": {
         "fast-deep-equal": "^2.0.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2417,7 +2418,8 @@
     "big.js": {
       "version": "5.2.2",
       "resolved": "http://registry.npm.taobao.org/big.js/download/big.js-5.2.2.tgz",
-      "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg="
+      "integrity": "sha1-ZfCvOC9Xi83HQr2cKB6cstd2gyg=",
+      "dev": true
     },
     "binary-extensions": {
       "version": "1.12.0",
@@ -4416,7 +4418,8 @@
     "emojis-list": {
       "version": "2.1.0",
       "resolved": "http://registry.npm.taobao.org/emojis-list/download/emojis-list-2.1.0.tgz",
-      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k="
+      "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+      "dev": true
     },
     "encodeurl": {
       "version": "1.0.2",
@@ -5410,27 +5413,6 @@
         }
       }
     },
-    "extract-text-webpack-plugin": {
-      "version": "4.0.0-beta.0",
-      "resolved": "http://registry.npm.taobao.org/extract-text-webpack-plugin/download/extract-text-webpack-plugin-4.0.0-beta.0.tgz",
-      "integrity": "sha1-9zYdf/QwtClh+NEyG6jBdXtdTEI=",
-      "requires": {
-        "async": "^2.4.1",
-        "loader-utils": "^1.1.0",
-        "schema-utils": "^0.4.5",
-        "webpack-sources": "^1.1.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.1",
-          "resolved": "http://registry.npm.taobao.org/async/download/async-2.6.1.tgz",
-          "integrity": "sha1-skWiPKcZMAROxT+kaqAKPofGphA=",
-          "requires": {
-            "lodash": "^4.17.10"
-          }
-        }
-      }
-    },
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "http://registry.npm.taobao.org/extsprintf/download/extsprintf-1.3.0.tgz",
@@ -5440,7 +5422,8 @@
     "fast-deep-equal": {
       "version": "2.0.1",
       "resolved": "http://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk="
+      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+      "dev": true
     },
     "fast-glob": {
       "version": "2.2.6",
@@ -5459,7 +5442,8 @@
     "fast-json-stable-stringify": {
       "version": "2.0.0",
       "resolved": "http://registry.npm.taobao.org/fast-json-stable-stringify/download/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I="
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
     },
     "fast-levenshtein": {
       "version": "2.0.6",
@@ -7587,7 +7571,8 @@
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "http://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA="
+      "integrity": "sha1-afaofZUTq4u4/mO9sJecRI5oRmA=",
+      "dev": true
     },
     "json-stable-stringify": {
       "version": "1.0.1",
@@ -8031,6 +8016,7 @@
       "version": "1.2.3",
       "resolved": "http://registry.npm.taobao.org/loader-utils/download/loader-utils-1.2.3.tgz",
       "integrity": "sha1-H/XcaRHJ8KBiUxpMBLYJQGEIwsc=",
+      "dev": true,
       "requires": {
         "big.js": "^5.2.2",
         "emojis-list": "^2.0.0",
@@ -8041,6 +8027,7 @@
           "version": "1.0.1",
           "resolved": "http://registry.npm.taobao.org/json5/download/json5-1.0.1.tgz",
           "integrity": "sha1-d5+wAYYE+oVOrL9iUhgNg1Q+Pb4=",
+          "dev": true,
           "requires": {
             "minimist": "^1.2.0"
           }
@@ -8474,7 +8461,8 @@
     "minimist": {
       "version": "1.2.0",
       "resolved": "http://registry.npm.taobao.org/minimist/download/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+      "dev": true
     },
     "mississippi": {
       "version": "2.0.0",
@@ -10583,7 +10571,8 @@
     "punycode": {
       "version": "2.1.1",
       "resolved": "http://registry.npm.taobao.org/punycode/download/punycode-2.1.1.tgz",
-      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew="
+      "integrity": "sha1-tYsBCsQMIsVldhbI0sLALHv0eew=",
+      "dev": true
     },
     "q": {
       "version": "1.5.1",
@@ -11243,6 +11232,7 @@
       "version": "0.4.7",
       "resolved": "http://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz",
       "integrity": "sha1-unT1l9K+LqiAExdG7hfQoJPGgYc=",
+      "dev": true,
       "requires": {
         "ajv": "^6.1.0",
         "ajv-keywords": "^3.1.0"
@@ -11251,7 +11241,8 @@
         "ajv-keywords": {
           "version": "3.2.0",
           "resolved": "http://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.2.0.tgz",
-          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo="
+          "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=",
+          "dev": true
         }
       }
     },
@@ -11702,7 +11693,8 @@
     "source-list-map": {
       "version": "2.0.1",
       "resolved": "http://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz",
-      "integrity": "sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ="
+      "integrity": "sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ=",
+      "dev": true
     },
     "source-map": {
       "version": "0.5.7",
@@ -12709,6 +12701,7 @@
       "version": "4.2.2",
       "resolved": "http://registry.npm.taobao.org/uri-js/download/uri-js-4.2.2.tgz",
       "integrity": "sha1-lMVA4f93KVbiKZUHwBCupsiDjrA=",
+      "dev": true,
       "requires": {
         "punycode": "^2.1.0"
       }
@@ -14110,6 +14103,7 @@
       "version": "1.3.0",
       "resolved": "http://registry.npm.taobao.org/webpack-sources/download/webpack-sources-1.3.0.tgz",
       "integrity": "sha1-KijcufH0X+lg2PFJMlK17mUw+oU=",
+      "dev": true,
       "requires": {
         "source-list-map": "^2.0.0",
         "source-map": "~0.6.1"
@@ -14118,7 +14112,8 @@
         "source-map": {
           "version": "0.6.1",
           "resolved": "http://registry.npm.taobao.org/source-map/download/source-map-0.6.1.tgz",
-          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM="
+          "integrity": "sha1-dHIq8y6WFOnCh6jQu95IteLxomM=",
+          "dev": true
         }
       }
     },
--- a/package.json
View file @203a0ac
+++ b/package.json
View file @203a0ac
@@ -9,7 +9,6 @@
   },
   "dependencies": {
     "axios": "^0.18.0",
-    "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "fastclick": "^1.0.6",
     "jquery": "^3.3.1",
     "lodash": "^4.17.11",
@@ -38,6 +37,7 @@
     "vue-loader": "^14.2.2",
     "vue-template-compiler": "^2.5.21",
     "vux-loader": "^1.2.9",
+    "webpack-merge": "^4.2.1",
     "yaml-loader": "^0.5.0"
   }
 }
--- a/public/index.html
View file @203a0ac
+++ b/public/index.html
View file @203a0ac
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>test1</title>
+    <title><%= htmlWebpackPlugin.options.title %></title>
   </head>
   <body>
     <noscript>
--- a/src/App.vue
View file @203a0ac
+++ b/src/App.vue
View file @203a0ac
@@ -4,6 +4,7 @@
       <router-link to="/">Home</router-link> |
       <router-link to="/about">About</router-link>
     </div>
+    <router-view></router-view>
   </div>
 </template>
--- a/src/main.js
View file @203a0ac
+++ b/src/main.js
View file @203a0ac
 /* jshint esversion: 6 */
 import Vue from 'vue';
+import Vuex from 'vuex';
+import VueRouter from 'vue-router';
 import App from './App.vue';
 import router from './router';
 import store from './store';
+import axios from './http';
+
+Vue.use(VueRouter);
+Vue.use(Vuex);
 Vue.config.productionTip = false;
 new Vue({
   router,
   store,
+  axios,
   render: h => h(App)
 }).$mount('#app');
--- a/src/subpage/main.js 0 → 100644
View file @203a0ac
+++ b/src/subpage/main.js 0 → 100644
View file @203a0ac
--- a/src/views/Home.vue
View file @203a0ac
+++ b/src/views/Home.vue
View file @203a0ac
 <template>
   <div class="home">
-    <x-header></x-header>
+    <!-- <x-header></x-header> -->
     <img alt="Vue logo" src="../assets/logo.png">
     <HelloWorld msg="Welcome to Your Vue.js App"/>
   </div>
@@ -9,13 +9,23 @@
 <script>
 // @ is an alias to /src
 import HelloWorld from '@/components/HelloWorld.vue'
-import { XHeader } from 'vux'
+// import { XHeader } from 'vux'
 export default {
   name: 'home',
   components: {
-    HelloWorld,
+    HelloWorld
-    XHeader
+    // XHeader
+  },
+  mounted () {
+    console.warn(axios);
+    // axios.get('b/auth/getFunctions')
+    //   .then(res => {
+    //     console.warn(res);
+    //   })
+    //   .catch(error => {
+    //     console.error(error);
+    //   });
   }
 }
 </script>
--- a/vue.config.js
View file @203a0ac
+++ b/vue.config.js
View file @203a0ac
 /* jshint esversion: 6 */
 const vuxLoader = require('vux-loader');
+const webpack = require('webpack');
+const merge = require('webpack-merge');
 module.exports = {
   // 基本路径
-  publicPath: process.env.NODE_ENV === 'production' ? '/' : '/boh/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/boh/' : '/',
-  // vux 相关配置,使用vux-ui
-  configureWebpack: config => {
-    vuxLoader.merge(config, {
-      options: {},
-      plugins: ['vux-ui']
-    });
-  },
   // 输出文件目录
   outputDir: 'dist',
+  // 放置生成的静态资源的目录
+  assetsDir: '',
+  // 指定生成的 index.html 的输出路径 (相对于 outputDir)。也可以是一个绝对路径。
+  indexPath: 'index.html',
+  filenameHashing: true,
+  pages: {
+    index: {
+      // page 的入口
+      entry: 'src/main.js',
+      // 模板来源
+      template: 'public/index.html',
+      // 在 dist/index.html 的输出
+      filename: 'index.html',
+      // 当使用 title 选项时，
+      // template 中的 title 标签需要是 <title><%= htmlWebpackPlugin.options.title %></title>
+      title: 'Index Page',
+      // 在这个页面中包含的块，默认情况下会包含
+      // 提取出来的通用 chunk 和 vendor chunk。
+      chunks: ['chunk-vendors', 'chunk-common', 'index']
+    },
+    // 当使用只有入口的字符串格式时，
+    // 模板会被推导为 `public/subpage.html`
+    // 并且如果找不到的话，就回退到 `public/index.html`。
+    // 输出文件名会被推导为 `subpage.html`。
+    subpage: 'src/subpage/main.js'
+  },
   // eslint-loader 是否在保存的时候检查
-  lintOnSave: undefined,
+  lintOnSave: 'error',
-  // webpack配置
+  // 是否使用包含运行时编译器的 Vue 构建版本。设置为 true 后你就可以在 Vue 组件中使用 template 选项了。
-  // see https://github.com/vuejs/vue-cli/blob/dev/docs/webpack.md
+  runtimeCompiler: true,
-  chainWebpack: () => {},
   // 生产环境是否生成 sourceMap 文件
-  productionSourceMap: true,
+  productionSourceMap: false,
+  // vux 相关配置,使用vux-ui
+  // 如果这个值是一个对象，则会通过 webpack-merge 合并到最终的配置中。
+  // 如果这个值是一个函数，则会接收被解析的配置作为参数。该函数及可以修改配置并不返回任何东西，也可以返回一个被克隆或合并过的配置版本。
+  // configureWebpack: config => {
+  //   vuxLoader.merge(config, {
+  //     options: {},
+  //     plugins: ['vux-ui']
+  //   });
+  //   // merge(config, {
+  //   //   plugins: [
+  //   //     new webpack.ProvidePlugin({
+  //   //       $: 'jquery',
+  //   //       jQuery: 'jquery',
+  //   //       '_': 'lodash',
+  //   //       'axios': 'axios',
+  //   //       'moment': 'moment'
+  //   //     })
+  //   //   ]
+  //   // });
+  //   if (process.env.NODE_ENV === 'production') {
+  //     // 为生产环境修改配置...
+  //   } else {
+  //     // 为开发环境修改配置...
+  //     console.warn(merge);
+  //   }
+  // },
+  // configureWebpack: {
+  //   plugins: [
+  //     new webpack.ProvidePlugin({
+  //       $: 'jquery',
+  //       jQuery: 'jquery',
+  //       '_': 'lodash',
+  //       'axios': 'axios',
+  //       'moment': 'moment'
+  //     })
+  //   ]
+  // },
+  // 是一个函数，会接收一个基于 webpack-chain 的 ChainableConfig 实例。允许对内部的 webpack 配置进行更细粒度的修改。
+  chainWebpack: () => {},
   // css相关配置
   css: {
     // 是否使用css分离插件 ExtractTextPlugin
-    extract: true,
+    // extract: true,
     // 开启 CSS source maps?
     sourceMap: false,
     // css预设器配置项
-    loaderOptions: {},
+    loaderOptions: {
-    // 启用 CSS modules for all css / pre-processor files.
+      css: {
+        // 这里的选项会传递给 css-loader
+      },
+      postcss: {
+        // 这里的选项会传递给 postcss-loader
+      }
+    },
+    // 默认情况下，只有 *.module.[ext] 结尾的文件才会被视作 CSS Modules 模块。设置为 true 后你就可以去掉文件名中的 .module 并将所有的 *.(css|scss|sass|less|styl(us)?) 文件视为 CSS Modules 模块。
     modules: false
   },
   // use thread-loader for babel & TS in production build
@@ -44,8 +110,27 @@ module.exports = {
     port: 8080,
     https: false,
     hotOnly: false,
-    proxy: null, // 设置代理
+    // 设置代理
-    before: app => {}
+    proxy: {
+      'api': {
+        filter: ['/op/', '/fi/', '/de/', '/st/', '/fr/', '/pr/', '/pu/', '/dl/', '/b/', '/t/', '/rpt/'],
+        target: 'http://dev.kmlab.com/boh',
+        // target: 'http://itomix-dev.kmlab.com/boh'
+        changeOrigin: true,
+        pathRewrite: {
+          '^/(.*)': '/$1'
+        },
+        onProxyReq: function (proxyReq, req, res, options) {
+          proxyReq.setHeader('X-Proxy-Host', req.header('host'));
+          proxyReq.setHeader('X-Proxy-Request-URI', req.url);
+        }
+      }
+    },
+    before: app => {},
+    overlay: {
+      warnings: true,
+      errors: true
+    }
   },
   // 第三方插件配置
   pluginOptions: {