s

.babelrc

@@ -9,7 +9,13 @@
     }],
     "stage-2"
   ],
-  "plugins": ["transform-vue-jsx", "transform-runtime",
+  "plugins": ["transform-vue-jsx", "transform-runtime",[
+    "component",
+      {
+        "libraryName": "mint-ui",
+        "style": true
+      },
+    ],
     ["import", [{ "libraryName": "vant","libraryDirectory":"es","style": true }]]
   ]
 }

build/webpack.dev.conf.js

@@ -47,6 +47,9 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     new webpack.DefinePlugin({
       'process.env': require('../config/dev.env')
     }),
+    new webpack.ProvidePlugin({
+      VConsole: 'vconsole'
+    }),
     new webpack.HotModuleReplacementPlugin(),
     new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update.
     new webpack.NoEmitOnErrorsPlugin(),

build/webpack.prod.conf.js

@@ -27,19 +27,32 @@ const webpackConfig = merge(baseWebpackConfig, {
     // filename: utils.assetsPath(env.versionTime+'/js/[name].[chunkhash].js'),
     // chunkFilename: utils.assetsPath(env.versionTime+'/js/[id].[chunkhash].js'),
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+    chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html
     new webpack.DefinePlugin({
       'process.env': env
     }),
+    new webpack.ProvidePlugin({
+      VConsole: process.env.NODE_ENV != 'production'?'vconsole':''
+    }),
     new UglifyJsPlugin({
       uglifyOptions: {
         compress: {
           warnings: false,
-          drop_console:process.env.NODE_ENV === 'production'?true:false
-        }
+          drop_console:process.env.NODE_ENV === 'production'?true:false,
+          collapse_vars: true,
+          reduce_vars: true,
+        },
+        // output: {
+        //   // 最紧凑的输出
+        //   // beautify: process.env.NODE_ENV === 'production'?false:true,
+        //   beautify:false,
+        //   // 删除所有的注释
+        //   // comments: process.env.NODE_ENV === 'production'?false:true,
+        //   comments: false,
+        // }
       },
       sourceMap: config.build.productionSourceMap,
       parallel: true
@@ -109,7 +122,7 @@ const webpackConfig = merge(baseWebpackConfig, {
       name: 'app',
       async: 'vendor-async',
       children: true,
-      minChunks: 3
+      minChunks: 4
     }),
 
     // copy custom static assets
@@ -125,7 +138,6 @@ const webpackConfig = merge(baseWebpackConfig, {
 
 if (config.build.productionGzip) {
   const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
   webpackConfig.plugins.push(
     new CompressionWebpackPlugin({
       asset: '[path].gz[query]',

config/dev.env.js

 'use strict';
 const merge = require('webpack-merge');
 const prodEnv = require('./prod.env');
+<<<<<<< HEAD
 // const ip = 'http://10.1.23.212:8085/'
 const ip = 'http://192.168.0.110:8085/'
+=======
+const ip = 'http://10.1.22.249:8085/'
+// const ip = 'http://192.168.31.185:8085/'
+>>>>>>> 56f88003620436c35dbb2990ada0c92e7f5a0d53
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   API_URL: `"${ip}"`,

config/index.js

@@ -20,11 +20,16 @@ module.exports = {
       }
     },
     // Various Dev Server settings
+<<<<<<< HEAD
     // host: '10.1.23.212', // can be overwritten by process.env.HOST
     host: '192.168.0.110', // can be overwritten by process.env.HOST
+=======
+    host: '10.1.22.249', // can be overwritten by process.env.HOST
+    // host: '192.168.31.185', // can be overwritten by process.env.HOST
+>>>>>>> 56f88003620436c35dbb2990ada0c92e7f5a0d53
     // host: 'localhost', // can be overwritten by process.env.HOST
     port: 8085, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
-    autoOpenBrowser: true,
+    autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,
     poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
@@ -41,7 +46,6 @@ module.exports = {
     cacheBusting: true,
     cssSourceMap: true
   },
-
   build: {
     // Template for index.html
     index: process.env.NODE_ENV === 'production' ? path.resolve(__dirname, '../dist/index.html') :  path.resolve(__dirname, '../dev/index.html'),

dev/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no"><meta name=screen-orientation content=portrait><meta name=x5-orientation content=portrait><title>唱唱启蒙英语</title><script>// setSize();
+    //   addEventListener('resize',setSize);
+    //   function setSize() {
+    //       document.documentElement.style.fontSize = document.documentElement.clientWidth/375*10+'px';
+    //   }</script><link rel=stylesheet href=https://at.alicdn.com/t/font_822651_g9r2j7kybxu.css><style>*{
         -webkit-overflow-scrolling: touch
       }
       .wrapper {
@@ -6,8 +10,13 @@
           overflow: hidden;
           position: fixed;
           background: #f4f4f4;
+<<<<<<< HEAD
 <<<<<<< HEAD
         }</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script></script><script type=text/javascript src=static/js/manifest.127f53ab7bb423dc3a32.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.07d4ae9bf14241b32f09.js></script></body></html>
 =======
         }</style><link href=static/css/app.3c0ad5f24e07150c06bc3b21fbd29d4b.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script src=static/vconsole/vconsole.min.js></script><script></script><script type=text/javascript src=static/js/manifest.b919e22d6aebb15a8313.js></script><script type=text/javascript src=static/js/vendor.a5a943cd8fb34eed2a77.js></script><script type=text/javascript src=static/js/app.2bff06f5bf8c8044fb3f.js></script></body></html>
 >>>>>>> 38808240962b9517ee3e5949d784cf3da84bde42
+=======
+        }
+        /* html{font-size: 1px;} */</style><link href=static/css/app.91d2eea1dfca80994de99748f577fac4.css rel=stylesheet></head><body><div id=app></div><script src=https://res.wx.qq.com/open/js/jweixin-1.3.2.js></script><script></script><script type=text/javascript src=static/js/manifest.34d24570965f5048de78.js></script><script type=text/javascript src=static/js/vendor.93e3f722c0accb688dee.js></script><script type=text/javascript src=static/js/app.2707373152f8818e5407.js></script></body></html>
+>>>>>>> 56f88003620436c35dbb2990ada0c92e7f5a0d53

dev/static/js/42.2a77bccb3988b86b709e.js

+webpackJsonp([42],{RYpB:function(r,n,e){(r.exports=e("FZ+f")(!0)).push([r.i,"\n.error-page[data-v-ea0f4bb0] {\n  text-align: center;\n  padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n  width: 50%;\n  margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n  font-size: 24px;\n  color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n  font-size: 14px;\n  display: inline-block;\n  border: 1px solid #53b4ca;\n  color: #53b4ca;\n  padding: 5px;\n  border-radius: 4px;\n  margin-top: 20px;\n}\n","",{version:3,sources:["C:/Users/Administrator/Desktop/h5/wechat/src/components/error.vue"],names:[],mappings:";AACA;EACE,mBAAmB;EACnB,mBAAmB;CACpB;AACD;EACE,WAAW;EACX,oBAAoB;CACrB;AACD;EACE,gBAAgB;EAChB,YAAY;CACb;AACD;EACE,gBAAgB;EAChB,sBAAsB;EACtB,0BAA0B;EAC1B,eAAe;EACf,aAAa;EACb,mBAAmB;EACnB,iBAAiB;CAClB",file:"error.vue",sourcesContent:["\n.error-page[data-v-ea0f4bb0] {\n  text-align: center;\n  padding-top: 50px ;\n}\n.error-page img[data-v-ea0f4bb0] {\n  width: 50%;\n  margin-bottom: 20px;\n}\n.error-page .error-text[data-v-ea0f4bb0] {\n  font-size: 24px;\n  color: #888;\n}\n.error-page .button[data-v-ea0f4bb0] {\n  font-size: 14px;\n  display: inline-block;\n  border: 1px solid #53b4ca;\n  color: #53b4ca;\n  padding: 5px;\n  border-radius: 4px;\n  margin-top: 20px;\n}\n"],sourceRoot:""}])},Zazt:function(r,n,e){"use strict";Object.defineProperty(n,"__esModule",{value:!0});var t=e("3xxH"),a=e.n(t),o={name:"error",data:function(){return{errorImageUrl:a.a}}},i=function(){var r=this,n=r.$createElement,e=r._self._c||n;return e("div",{staticClass:"error-page"},[e("img",{attrs:{src:r.errorImageUrl}}),r._v(" "),e("div",{staticClass:"error-text"},[r._v("\n    404! 很抱歉，页面未找到\n    "),e("br"),r._v(" "),e("div",{staticClass:"button",on:{click:function(n){r.$router.push({name:"index"})}}},[r._v("返回首页")])])])};i._withStripped=!0;var s={render:i,staticRenderFns:[]},p=s;var A=!1;var c=e("VU/8")(o,p,!1,function(r){A||e("zqTw")},"data-v-ea0f4bb0",null);c.options.__file="src/components/error.vue";n.default=c.exports},zqTw:function(r,n,e){var t=e("RYpB");"string"==typeof t&&(t=[[r.i,t,""]]),t.locals&&(r.exports=t.locals);e("rjj0")("7406b040",t,!1,{})}});
\ No newline at end of file