Merge branch 'dev'

Author: harsima

.babelrc

@@ -6,7 +6,6 @@
   "plugins": [
     "syntax-dynamic-import"
   ],
-  "comments": false,
   "env": {
     "test": {
       "presets": ["env", "stage-2"],

build/webpack.prod.conf.js

@@ -27,8 +27,8 @@ const webpackConfig = merge(baseWebpackConfig, {
     devtool: config.build.productionSourceMap ? '#source-map' : false,
     output: {
         path: config.build.assetsRoot,
-        filename: utils.assetsPath('js/[name].[chunkhash].js'),
-        chunkFilename: utils.assetsPath('js/[name].[chunkhash].js')
+        filename: utils.assetsPath('js/[name].[chunkhash:7].js'),
+        chunkFilename: utils.assetsPath('js/[name].[chunkhash:7].js')
     },
     plugins: [
         // http://vuejs.github.io/vue-loader/en/workflow/production.html
@@ -43,7 +43,7 @@ const webpackConfig = merge(baseWebpackConfig, {
         }),
         // extract css into its own file
         new ExtractTextPlugin({
-            filename: utils.assetsPath('css/[name].[contenthash].css')
+            filename: utils.assetsPath('css/[name].[contenthash:7].css')
         }),
         // Compress extracted CSS. We are using this plugin so that possible
         // duplicated CSS from different components can be deduped.

mock/login.js

@@ -1,6 +1,6 @@
 var data = {
     'login': '@boolean',
-    'validate': '@boolean',
+    'captcha': "@image('100x40', '#FFFFFF', 'captcha')",
     'message': '这里是登录提交后错误提示信息@increment',
     'uid': '@id',
     'name': '@cname',

src/assets/css/common/article.scss

@@ -4,7 +4,8 @@
     margin-bottom: 2*$basicMargin;
     // padding: 0 16px;
     h2{
-        font-size: $basicFontSize*1.2;
+        font-size: $basicFontSize*1.3;
+        padding: $basicPadding 0;
     }
     & > div{
         margin-bottom: 5px;

src/assets/css/components/sysSection.scss

@@ -13,8 +13,8 @@
             clear: both;
         }
         & > strong{
-            font-weight: normal;
-            font-size: 18px;
+            font-weight: bold;
+            font-size: 22px;
             line-height: 50px;
         }
         &  > .toolbar{

src/assets/css/components/sysTitle.scss

@@ -1,10 +1,10 @@
 .sys-title{
-    height: 46px;
+    height: 60px;
     margin-bottom: $basicMargin;
     border-bottom: 1px solid $borderColor;
     & > strong{
-        line-height: 46px;
-        font-size: 18px;
+        line-height: 60px;
+        font-size: 26px;
         font-weight: bold;
     }
 }

src/assets/css/page/login.scss

@@ -18,13 +18,15 @@
     }
 
     .form-group {
-        input::-webkit-input-placeholder{
-            color: #7e9fb0;
-        }
         position: relative;
         padding-bottom: 20px;
         color: $loginTextColor;
         overflow: hidden;
+
+        input::-webkit-input-placeholder{
+            color: #7e9fb0;
+        }
+        
         .el-input__inner {
             height: 40px;
             line-height: 40px;
@@ -35,6 +37,7 @@
             color: $loginInputColor;
             font-size: 15px;
             overflow: hidden;
+
             &:hover{
                 border-color: rgba(255,255,255,.2);
             }
@@ -47,11 +50,18 @@
                 border-color: $red;
                 background-color: $loginInputErrBg;
             }
-            &.captcha input{
-                width: 200px;
-            }
-            &.captcha img{
-                float: right;
+            &.captcha {
+                .el-input{
+                    width: auto;
+                }
+                input{
+                    width: 200px;
+                }
+                img{
+                    float: right;
+                    width: 100px;
+                    height: 40px;
+                }
             }
         }
         .el-form-item__error{
@@ -73,6 +83,7 @@
         font-size: 18px;
         text-align: center;
         cursor: pointer;
+
         &:hover{
             background: darken($loginBtn, 2%)
         }
@@ -89,6 +100,7 @@
     .lang-toggle{
         text-align: center;
         color: $loginTextColor;
+
         span{
             display: inline-block;
             width: 26px;
@@ -99,6 +111,7 @@
             font-size: 14px;
             text-align: center;
             cursor: pointer;
+
             &.cur{
                 background: $loginLangCurBg;
                 color: $loginLangCurColor;

src/index.vue

@@ -5,13 +5,19 @@
 </template>
 
 <script>
-import changeTheme from "@/util/changeTheme"
+import setTheme from "@/util/setTheme"
+import Cookie from 'js-cookie'
 
 export default {
+    // 加载默认语言包
+    created(){
+        let defLang = Cookie.get('lang') || this.$i18n.locale
+        this.$store.dispatch("loadLang", defLang)
+    },
     // 初次加载时，可通过接口获取用户的主题信息，或者通过按钮触发，或者直接加载默认主题
     mounted() {
         this.$nextTick(() => {
-            changeTheme("theme-default")
+            setTheme("theme-default")
             this.$store.commit("setThemeColor", "default")
         })
     }

src/lang/en.js

@@ -1,14 +1,19 @@
+import enElement from 'element-ui/lib/locale/lang/en'
+
 export default {
-    username: 'User Name',
-    password: 'Password',
-    login: 'Login',
-    captcha: 'Captcha',
-    forgetPassword: 'Forget Password?',
-    loginTip: 'The login result is random. Just fill in the captcha',
-    editpassword: 'Edit Password',
-    logout: 'Logout',
-    errMsg: {
-        inputRequired: 'Please Input {cont}',
-        selectRequired: 'Please Select {cont}'
-    }
+    global: {
+        username: 'User Name',
+        password: 'Password',
+        login: 'Login',
+        captcha: 'Captcha',
+        forgetPassword: 'Forget Password?',
+        loginTip: 'The login result is random. Just fill in the captcha',
+        editpassword: 'Edit Password',
+        logout: 'Logout',
+        errMsg: {
+            inputRequired: 'Please Input {cont}',
+            selectRequired: 'Please Select {cont}'
+        }
+    },
+    ...enElement
 }

src/lang/index.js

@@ -0,0 +1,8 @@
+export default {
+    // 中文简体
+    "zhCN": {},
+    // 中文繁体
+    "zhTW": {},
+    // 英文
+    "en": {}
+}

src/lang/zh-cn.js

@@ -0,0 +1,19 @@
+import zhElement from 'element-ui/lib/locale/lang/zh-CN'
+
+export default {
+    global: {
+        username: '用户名',
+        password: '密码',
+        login: '登录',
+        captcha: '验证码',
+        forgetPassword: '忘记密码？',
+        loginTip: '当前登录结果随机。验证码随便填',
+        editpassword: '修改密码',
+        logout: '退出登录',
+        errMsg: {
+            inputRequired: '请输入{cont}',
+            selectRequired: '请选择{cont}'
+        }
+    },
+    ...zhElement
+}

src/lang/zhCN.js

@@ -18,7 +18,9 @@ import './components/platformCom/install'
 
 // 注册组件到Vue
 Vue.prototype.$axios = axios
-Vue.use(ElementUI)
+Vue.use(ElementUI, {
+    i18n: (key, value) => i18n.t(key, value)
+})
 
 new Vue({
     i18n,