Merge pull request #125 from lin-xin/dev

'修改构建错误'

build/webpack.dll.conf.js

@@ -1,29 +0,0 @@
-const path = require('path');
-const webpack = require('webpack');
-
-module.exports = {
-  entry: {
-    vendor: ['vue/dist/vue.common.js','vue-router', 'babel-polyfill','axios']
-  },
-  output: {
-    path: path.join(__dirname, '../static/js'),
-    filename: '[name].dll.js',
-    library: '[name]_library'
-  },
-  plugins: [
-    new webpack.DllPlugin({
-      path: path.join(__dirname, '.', '[name]-manifest.json'),
-      name: '[name]_library'
-    }),
-    new webpack.optimize.UglifyJsPlugin({
-      compress: {
-        warnings: false
-      }
-    }),
-    new webpack.DefinePlugin({
-      'process.env': {
-        NODE_ENV: '"production"'
-      }
-    })
-  ]
-};

package.json

@@ -6,8 +6,7 @@
   "private": true,
   "scripts": {
     "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
-    "build": "node build/build.js",
-    "build:dll": "webpack --config build/webpack.dll.conf.js"
+    "build": "node build/build.js"
   },
   "dependencies": {
     "axios": "^0.15.3",

src/App.vue

@@ -4,7 +4,6 @@
     </div>
 </template>
 <style>
-    @import 'http://at.alicdn.com/t/font_830376_qzecyukz0s.css';
     @import "../static/css/main.css";
     @import "../static/css/color-dark.css";     /*深色主题*/
     /*@import "../static/css/theme-green/color-green.css";   浅绿色主题*/

src/components/page/Icon.vue

@@ -180,9 +180,6 @@
                     return item.indexOf(this.keyword) !== -1;
                 })
             }
-        },
-        created(){
-            console.log(this.iconList.length);
         }
     }
 </script>

src/components/page/Login.vue

@@ -61,7 +61,7 @@
         position: relative;
         width:100%;
         height:100%;
-        background-image: url(../../../static/img/login-bg.jpg);
+        background-image: url(../../assets/login-bg.jpg);
         background-size: 100%;
     }
     .ms-title{

src/main.js

@@ -5,6 +5,7 @@ import axios from 'axios';
 import ElementUI from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';    // 默认主题
 // import '../static/css/theme-green/index.css';       // 浅绿色主题
+import '../static/css/icon.css';
 import "babel-polyfill";
 
 Vue.use(ElementUI, { size: 'small' });

static/css/icon.css

@@ -0,0 +1,4 @@
+
+    [class*=" el-icon-lx"], [class^=el-icon-lx] {
+        font-family: lx-iconfont!important;
+    }

static/css/main.css

@@ -19,9 +19,7 @@ body {
 a {
     text-decoration: none
 }
-[class*=" el-icon-lx"], [class^=el-icon-lx] {
-    font-family: lx-iconfont!important;
-}
+
 
 .content-box {
     position: absolute;