node-uwla分支为new-chinaelite的代码整合

b339cc6b · 王鹏飞 · e6a30879 · b339cc6b · b339cc6b · b339cc6b
--- a/.config.dev.js
+++ b/.config.dev.js
 module.exports = {
  domain: 'dev.ezijing.com',
-  url: 'https://ciis.ezijing.com/api',
+  url: 'https://chinafflg.ezijing.com/api',
  isEnableToIphoneDebugger: false,
-  // apiBaseURL: '//demo-login.ezijing.com/',
+  apiBaseURL: '/api',
  webpack: {
    externals: {
      CKEDITOR: 'window.CKEDITOR',
@@ -32,7 +32,5 @@ module.exports = {
    }
  },
  ProvidePlugin: {},
-  others: {
+  others: {}
-    projectId: '1006'
-  }
 }
--- a/.config.pro.js
+++ b/.config.pro.js
 module.exports = {
-  url: '/api',
+  url: '/',
  DesDir: './client-dist',
  apiBaseURL: '/api',
  isUploadStatic: false,
@@ -13,7 +13,5 @@ module.exports = {
    }
  },
  ProvidePlugin: {},
-  others: {
+  others: {}
-    projectId: '1006'
-  }
 }
--- a/.config.test.js
+++ b/.config.test.js
 module.exports = {
-  url: '/api',
+  url: '/',
  DesDir: './client-dist',
  apiBaseURL: '/api',
+  CDN_DIR: 'static/build/learn-test/',
  isUploadStatic: false,
-  isEnableToIphoneDebugger: false,
+  isEnableToIphoneDebugger: true,
  webpack: {
    externals: {
      CKEDITOR: 'window.CKEDITOR',
@@ -13,7 +14,5 @@ module.exports = {
    }
  },
  ProvidePlugin: {},
-  others: {
+  others: {}
-    projectId: '1006'
-  }
 }
--- a/build/checkNodeVersion.js
+++ b/build/checkNodeVersion.js
+var semver = require('semver')
+var requiredVersion = require('../package.json').engines.node
+function checkNodeVersion (wanted, id) {
+  if (!semver.satisfies(process.version, wanted)) {
+    console.log('\x1b[91m%s\x1B[0m',
+      'You are using Node ' + process.version + ', but this version of ' + id +
+      ' requires Node ' + wanted + '.\nPlease upgrade your Node version.'
+    )
+    process.exit(1)
+  }
+}
+checkNodeVersion(requiredVersion, '`node uploadAliyunCDN.js`')
--- a/build/chinafflg.ezijing.com.key
+++ b/build/chinafflg.ezijing.com.key
+<html>
+<head><title>404 Not Found</title></head>
+<body bgcolor="white">
+<center><h1>404 Not Found</h1></center>
+<hr><center>nginx/1.12.0</center>
+</body>
+</html>
--- a/build/chinafflg.ezijing.com.pem
+++ b/build/chinafflg.ezijing.com.pem
+<html>
+<head><title>404 Not Found</title></head>
+<body bgcolor="white">
+<center><h1>404 Not Found</h1></center>
+<hr><center>nginx/1.12.0</center>
+</body>
+</html>
--- a/build/config.js
+++ b/build/config.js
 const isDev = process.env.NODE_ENV
+const RegStrs = require('./regExpStr.js')
 let config = {
  isDev: isDev,
@@ -21,6 +22,8 @@ let config = {
  webpack: {}
 }
+config.RegStrs = RegStrs
 let vueClientConfig = {}
 config.domain = ''
 if (config.isDev === 'development') {

--- a/build/regExpStr.js
+++ b/build/regExpStr.js
+/* 由于正则表达式，不能进行跟 gulpfile 中 去注释 在一起 */
+module.exports = {
+  regExp_static: /('|"|`)[\.|\/]*?static\/(.*?\.(png|jpe?g|gif|svg|ico)(\?.*)?)\1/g
+}
--- a/build/stringReplaceLoader.js
+++ b/build/stringReplaceLoader.js
+const _conf = require('./config')
+module.exports = function (source) {
+  if (_conf.isDev !== 'development') {
+    return source
+            .replace(_conf.RegStrs.regExp_static, '$1' + _conf.CDN_BASE + _conf.CDN_DIR + 'static/$2$1')
+  } else {
+    return source
+  }
+}
--- a/build/webpack.base.conf.js
+++ b/build/webpack.base.conf.js
@@ -22,6 +22,8 @@ const $GLOBAL = {
  EntryStaticPath: path.resolve(__dirname, '../' + 'static'),
  OutputStaticPath: path.resolve(__dirname, '../' + _conf.DesDir + '/static'),
+  RegStrs: _conf.RegStrs,
  webConf: {
    'isDev': _conf.isDev,
    'serverPort': process.env.SERVER_PORT || 8000,
@@ -52,13 +54,20 @@ $GLOBAL.BaseConfig = {
      '@api': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/api'),
      '@action': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/action'),
      '@tool': path.resolve(__dirname, '../' + $GLOBAL.ResDir + '/tool')
-    }
+    },
+    extensions: ['.js', '.json', '.jsx', '.vue']
  },
  module: {
    rules: [
+      // {
+      //   test: /\.(vue|js|jsx)$/,
+      //   loader: 'eslint-loader',
+      //   exclude: /node_modules/,
+      //   enforce: 'pre'
+      // },
      {
-        test: /\.(vue|js|jsx)$/,
+        test: /\.(vue|js|jsx)|((sa|sc|c)ss)$/,
-        loader: 'eslint-loader',
+        loader: './build/stringReplaceLoader.js',
        exclude: /node_modules/,
        enforce: 'pre'
      },
@@ -71,10 +80,32 @@ $GLOBAL.BaseConfig = {
        exclude: /(node_modules)|(dist)/,
        loader: 'babel-loader',
        options: {
-          presets: ['env', 'stage-2'],
+          presets: [[
+            '@babel/preset-env',
+            {
+              "targets": {
+                "browsers": [
+                  "last 2 versions",
+                  "ie >= 11"
+                ],
+              },
+              corejs: '3.6.5',
+              useBuiltIns: 'usage'
+            }
+          ]],
          plugins: [
-            'transform-vue-jsx',
+            '@babel/plugin-syntax-jsx',
-            'syntax-dynamic-import'
+            '@babel/plugin-proposal-class-properties',
+            '@babel/plugin-syntax-dynamic-import',
+            [
+              '@babel/plugin-transform-runtime',
+              {
+                corejs: 3,
+                helpers: true,
+                regenerator: true,
+                useESModules: false
+              }
+            ]
          ]
        }
      },

--- a/build/webpack.client.conf.js
+++ b/build/webpack.client.conf.js
@@ -9,6 +9,7 @@ const VueLoaderPlugin = require('vue-loader/lib/plugin')
 const AutoPrefixer = require('autoprefixer')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const HtmlWebpackPlugin = require('html-webpack-plugin')
+const HtmlReplaceWebpackPlugin = require('html-replace-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const VconsoleWebpackPlugin = require('vconsole-webpack-plugin')
 const $GLOBAL = require('./webpack.base.conf')
@@ -158,6 +159,12 @@ if ($GLOBAL.isDev === 'development') {
          collapseWhitespace: true
        }
      }),
+      new HtmlReplaceWebpackPlugin([
+        {
+          pattern: $GLOBAL.RegStrs.regExp_static,
+          replacement: '$1' + $GLOBAL.webConf.CDN_PATH + 'static/$2$1'
+        }
+      ]),
      new CopyWebpackPlugin([
        {
          from: $GLOBAL.EntryStaticPath,
@@ -167,11 +174,11 @@ if ($GLOBAL.isDev === 'development') {
            return content
          }
        }
-      ])
+      ]),
-      // $GLOBAL.isDev === 'test' && new VconsoleWebpackPlugin({
+      new VconsoleWebpackPlugin({
-      //   filter: [],
+        filter: [],
-      //   enable: $GLOBAL.isEnableToIphoneDebugger
+        enable: $GLOBAL.isEnableToIphoneDebugger
-      // })
+      })
    ],
    optimization: {
      runtimeChunk: {

--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
--- a/src/action/InfoAction.js
+++ b/src/action/InfoAction.js
--- a/src/action/LoginAction.js
+++ b/src/action/LoginAction.js
--- a/src/action/NewsAction.js
+++ b/src/action/NewsAction.js
--- a/src/action/ReportAction.js
+++ b/src/action/ReportAction.js
--- a/src/action/TestAction.js
+++ b/src/action/TestAction.js
--- a/src/action/axiosService.js
+++ b/src/action/axiosService.js
--- a/src/action/base_action.js
+++ b/src/action/base_action.js
--- a/src/action/index.js
+++ b/src/action/index.js
--- a/src/api/base_api.js
+++ b/src/api/base_api.js
--- a/src/api/index.js
+++ b/src/api/index.js
--- a/src/api/info_api.js
+++ b/src/api/info_api.js
--- a/src/api/list_api.js
+++ b/src/api/list_api.js
--- a/src/pages/login/components/api/login_api.js
+++ b/src/pages/login/components/api/login_api.js
--- a/src/api/my.js
+++ b/src/api/my.js
--- a/src/api/news_api.js
+++ b/src/api/news_api.js
--- a/src/api/report_api.js
+++ b/src/api/report_api.js
--- a/src/api/test_api.js
+++ b/src/api/test_api.js
--- a/src/assets/css/ProjectContent.scss
+++ b/src/assets/css/ProjectContent.scss
--- a/src/assets/css/animate.min.css
+++ b/src/assets/css/animate.min.css
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
--- a/src/assets/favicon.ico
+++ b/src/assets/favicon.ico
--- a/src/assets/font-icons/iconfont.css
+++ b/src/assets/font-icons/iconfont.css
--- a/src/assets/font-icons/iconfont.eot
+++ b/src/assets/font-icons/iconfont.eot
--- a/src/assets/font-icons/iconfont.js
+++ b/src/assets/font-icons/iconfont.js
--- a/src/assets/font-icons/iconfont.json
+++ b/src/assets/font-icons/iconfont.json
--- a/src/assets/font-icons/iconfont.ttf
+++ b/src/assets/font-icons/iconfont.ttf
--- a/src/assets/font-icons/iconfont.woff
+++ b/src/assets/font-icons/iconfont.woff
--- a/src/assets/font-icons/iconfont.woff2
+++ b/src/assets/font-icons/iconfont.woff2
--- a/src/assets/font-icons/demo.css
+++ b/src/assets/font-icons/demo.css
--- a/src/assets/icons/demo_fontclass.html
+++ b/src/assets/icons/demo_fontclass.html
--- a/src/assets/font-icons/demo_index.html
+++ b/src/assets/font-icons/demo_index.html
--- a/src/assets/icons/demo_symbol.html
+++ b/src/assets/icons/demo_symbol.html
--- a/src/assets/icons/demo_unicode.html
+++ b/src/assets/icons/demo_unicode.html
--- a/src/assets/icons/iconfont.css
+++ b/src/assets/icons/iconfont.css
--- a/src/assets/icons/iconfont.eot
+++ b/src/assets/icons/iconfont.eot
--- a/src/assets/icons/iconfont.js
+++ b/src/assets/icons/iconfont.js
--- a/src/assets/font-icons/iconfont.svg
+++ b/src/assets/font-icons/iconfont.svg
--- a/src/assets/icons/iconfont.ttf
+++ b/src/assets/icons/iconfont.ttf
--- a/src/assets/icons/iconfont.woff
+++ b/src/assets/icons/iconfont.woff
--- a/src/assets/icons/iconfont.woff2
+++ b/src/assets/icons/iconfont.woff2
--- a/src/assets/images/404.png
+++ b/src/assets/images/404.png
--- a/src/assets/images/500.png
+++ b/src/assets/images/500.png
--- a/src/assets/images/apply-for/bg_01.png
+++ b/src/assets/images/apply-for/bg_01.png
--- a/src/assets/images/apply-for/bg_02.png
+++ b/src/assets/images/apply-for/bg_02.png
--- a/src/assets/images/apply-for/bg_down.png
+++ b/src/assets/images/apply-for/bg_down.png
--- a/src/assets/images/apply-for/hear.png
+++ b/src/assets/images/apply-for/hear.png
--- a/src/assets/images/bg-mobile.png
+++ b/src/assets/images/bg-mobile.png
--- a/src/assets/images/cfbk.png
+++ b/src/assets/images/cfbk.png
--- a/src/assets/images/fotbk.png
+++ b/src/assets/images/fotbk.png
--- a/src/assets/images/home.png
+++ b/src/assets/images/home.png
--- a/src/assets/images/home_01.png
+++ b/src/assets/images/home_01.png
--- a/src/assets/images/home_02.png
+++ b/src/assets/images/home_02.png
--- a/src/assets/images/icon1.png
+++ b/src/assets/images/icon1.png
--- a/src/assets/images/icon2.png
+++ b/src/assets/images/icon2.png
--- a/src/assets/images/icon3.png
+++ b/src/assets/images/icon3.png
--- a/src/assets/images/icon4.png
+++ b/src/assets/images/icon4.png
--- a/src/assets/images/icon_logout.png
+++ b/src/assets/images/icon_logout.png
--- a/src/assets/images/icon_success.png
+++ b/src/assets/images/icon_success.png
--- a/src/assets/images/logginred.png
+++ b/src/assets/images/logginred.png
--- a/src/assets/images/login_bg.png
+++ b/src/assets/images/login_bg.png
--- a/src/assets/images/logo.png
+++ b/src/assets/images/logo.png
--- a/src/assets/images/logofff.png
+++ b/src/assets/images/logofff.png
--- a/src/assets/images/ma01.png
+++ b/src/assets/images/ma01.png
--- a/src/assets/images/ma02.png
+++ b/src/assets/images/ma02.png
--- a/src/assets/images/ma03.png
+++ b/src/assets/images/ma03.png
--- a/src/assets/images/ma04.png
+++ b/src/assets/images/ma04.png
--- a/src/assets/images/major-set/blxbj.png
+++ b/src/assets/images/major-set/blxbj.png
--- a/src/assets/images/major-set/blxbjh.png
+++ b/src/assets/images/major-set/blxbjh.png
--- a/src/assets/images/major-set/bx1.png
+++ b/src/assets/images/major-set/bx1.png
--- a/src/assets/images/major-set/bx2.png
+++ b/src/assets/images/major-set/bx2.png
--- a/src/assets/images/major-set/bx3.png
+++ b/src/assets/images/major-set/bx3.png
--- a/src/assets/images/major-set/bx4.png
+++ b/src/assets/images/major-set/bx4.png
--- a/src/assets/images/major-set/bxl1.png
+++ b/src/assets/images/major-set/bxl1.png
--- a/src/assets/images/major-set/bxl2.png
+++ b/src/assets/images/major-set/bxl2.png
--- a/src/assets/images/major-set/bxl3.png
+++ b/src/assets/images/major-set/bxl3.png
--- a/src/assets/images/major-set/bxl4.png
+++ b/src/assets/images/major-set/bxl4.png
--- a/src/assets/images/major-set/dl1.png
+++ b/src/assets/images/major-set/dl1.png
--- a/src/assets/images/major-set/dl2.png
+++ b/src/assets/images/major-set/dl2.png
--- a/src/assets/images/major-set/dl3.png
+++ b/src/assets/images/major-set/dl3.png
--- a/src/assets/images/major-set/left.png
+++ b/src/assets/images/major-set/left.png
--- a/src/assets/images/major-set/lt-new1.png
+++ b/src/assets/images/major-set/lt-new1.png
--- a/src/assets/images/major-set/lt-new2.png
+++ b/src/assets/images/major-set/lt-new2.png
--- a/src/assets/images/major-set/lt-new3.png
+++ b/src/assets/images/major-set/lt-new3.png
--- a/src/assets/images/major-set/lt-new4.png
+++ b/src/assets/images/major-set/lt-new4.png
--- a/src/assets/images/major-set/lt-new5.png
+++ b/src/assets/images/major-set/lt-new5.png
--- a/src/assets/images/major-set/lt-new6.png
+++ b/src/assets/images/major-set/lt-new6.png
--- a/src/assets/images/major-set/lt-new7.png
+++ b/src/assets/images/major-set/lt-new7.png
--- a/src/assets/images/major-set/lt01.png
+++ b/src/assets/images/major-set/lt01.png
--- a/src/assets/images/major-set/lt02.png
+++ b/src/assets/images/major-set/lt02.png
--- a/src/assets/images/major-set/lt03.png
+++ b/src/assets/images/major-set/lt03.png
--- a/src/assets/images/major-set/lt04.png
+++ b/src/assets/images/major-set/lt04.png
--- a/src/assets/images/major-set/lt05.png
+++ b/src/assets/images/major-set/lt05.png
--- a/src/assets/images/major-set/lt06.png
+++ b/src/assets/images/major-set/lt06.png
--- a/src/assets/images/major-set/lt07.png
+++ b/src/assets/images/major-set/lt07.png
--- a/src/assets/images/major-set/lt08.png
+++ b/src/assets/images/major-set/lt08.png
--- a/src/assets/images/major-set/lt09.png
+++ b/src/assets/images/major-set/lt09.png
--- a/src/assets/images/major-set/ma01.png
+++ b/src/assets/images/major-set/ma01.png
--- a/src/assets/images/major-set/ma02.png
+++ b/src/assets/images/major-set/ma02.png
--- a/src/assets/images/major-set/ma03.png
+++ b/src/assets/images/major-set/ma03.png
--- a/src/assets/images/major-set/ma04.png
+++ b/src/assets/images/major-set/ma04.png
--- a/src/assets/images/major-set/mid-1.png
+++ b/src/assets/images/major-set/mid-1.png
--- a/src/assets/images/major-set/mid-2.png
+++ b/src/assets/images/major-set/mid-2.png
--- a/src/assets/images/major-set/mid-3.png
+++ b/src/assets/images/major-set/mid-3.png
--- a/src/assets/images/major-set/mid-4.png
+++ b/src/assets/images/major-set/mid-4.png
--- a/src/assets/images/major-set/mid-5.png
+++ b/src/assets/images/major-set/mid-5.png
--- a/src/assets/images/major-set/mid-6.png
+++ b/src/assets/images/major-set/mid-6.png
--- a/src/assets/images/major-set/mid-7.png
+++ b/src/assets/images/major-set/mid-7.png
--- a/src/assets/images/major-set/mid-new1.png
+++ b/src/assets/images/major-set/mid-new1.png
--- a/src/assets/images/major-set/mid-new2.png
+++ b/src/assets/images/major-set/mid-new2.png
--- a/src/assets/images/major-set/mid-new3.png
+++ b/src/assets/images/major-set/mid-new3.png
--- a/src/assets/images/major-set/mid-new4.png
+++ b/src/assets/images/major-set/mid-new4.png
--- a/src/assets/images/major-set/mz.png
+++ b/src/assets/images/major-set/mz.png
--- a/src/assets/images/major-set/right-1.png
+++ b/src/assets/images/major-set/right-1.png
--- a/src/assets/images/major-set/right-2.png
+++ b/src/assets/images/major-set/right-2.png
--- a/src/assets/images/major-set/su.png
+++ b/src/assets/images/major-set/su.png
--- a/src/assets/images/major-set/xbg.png
+++ b/src/assets/images/major-set/xbg.png
--- a/src/assets/images/major-set/xl1.png
+++ b/src/assets/images/major-set/xl1.png
--- a/src/assets/images/mes1.png
+++ b/src/assets/images/mes1.png
--- a/src/assets/images/mesbk.png
+++ b/src/assets/images/mesbk.png
--- a/src/assets/images/my_01.png
+++ b/src/assets/images/my_01.png
--- a/src/assets/images/my_02.png
+++ b/src/assets/images/my_02.png
--- a/src/assets/images/my_03.png
+++ b/src/assets/images/my_03.png
--- a/src/assets/images/my_icon.png
+++ b/src/assets/images/my_icon.png
--- a/src/assets/images/my_pay_01.png
+++ b/src/assets/images/my_pay_01.png
--- a/src/assets/images/my_pay_02.png
+++ b/src/assets/images/my_pay_02.png
--- a/src/assets/images/mz.png
+++ b/src/assets/images/mz.png
--- a/src/assets/images/mzx.png
+++ b/src/assets/images/mzx.png
--- a/src/assets/images/play.png
+++ b/src/assets/images/play.png
--- a/src/assets/images/stop.png
+++ b/src/assets/images/stop.png
--- a/src/assets/images/tir.png
+++ b/src/assets/images/tir.png
--- a/src/assets/images/tir1.png
+++ b/src/assets/images/tir1.png
--- a/src/assets/images/tir2.png
+++ b/src/assets/images/tir2.png
--- a/src/assets/images/tir3.png
+++ b/src/assets/images/tir3.png
--- a/src/assets/images/tir4.png
+++ b/src/assets/images/tir4.png
--- a/src/assets/images/wm.png
+++ b/src/assets/images/wm.png
--- a/src/assets/images/wm/wm_01.png
+++ b/src/assets/images/wm/wm_01.png
--- a/src/assets/images/wm/wm_02.png
+++ b/src/assets/images/wm/wm_02.png
--- a/src/assets/images/wm/wm_03.png
+++ b/src/assets/images/wm/wm_03.png
--- a/src/assets/images/wm/wm_04.png
+++ b/src/assets/images/wm/wm_04.png
--- a/src/assets/images/wm/wm_05.png
+++ b/src/assets/images/wm/wm_05.png
--- a/src/assets/images/wm/wm_06.png
+++ b/src/assets/images/wm/wm_06.png
--- a/src/assets/images/wm/wm_07.png
+++ b/src/assets/images/wm/wm_07.png
--- a/src/assets/images/wm/wm_08.png
+++ b/src/assets/images/wm/wm_08.png
--- a/src/assets/images/wm/wm_09.png
+++ b/src/assets/images/wm/wm_09.png
--- a/src/assets/images/wm/wm_21.png
+++ b/src/assets/images/wm/wm_21.png
--- a/src/assets/images/wm/wm_22.png
+++ b/src/assets/images/wm/wm_22.png
--- a/src/assets/images/wm/wm_23.png
+++ b/src/assets/images/wm/wm_23.png
--- a/src/assets/images/wm/wm_24.png
+++ b/src/assets/images/wm/wm_24.png
--- a/src/assets/images/wm/wm_25.png
+++ b/src/assets/images/wm/wm_25.png
--- a/src/assets/images/wm/wm_26.png
+++ b/src/assets/images/wm/wm_26.png
--- a/src/assets/images/wm/wmbg.png
+++ b/src/assets/images/wm/wmbg.png
--- a/src/assets/images/wm/wmbg2.png
+++ b/src/assets/images/wm/wmbg2.png
--- a/src/assets/img/UWLALogo.png
+++ b/src/assets/img/UWLALogo.png
--- a/src/assets/img/alipay.png
+++ b/src/assets/img/alipay.png
--- a/src/assets/img/brief.png
+++ b/src/assets/img/brief.png
--- a/src/assets/img/download.png
+++ b/src/assets/img/download.png
--- a/src/assets/img/head/ezijing-logo.png
+++ b/src/assets/img/head/ezijing-logo.png
--- a/src/assets/img/head/ezijing-logo2.png
+++ b/src/assets/img/head/ezijing-logo2.png
--- a/src/assets/img/head/kelley-logo.png
+++ b/src/assets/img/head/kelley-logo.png
--- a/src/assets/img/head/kelley-logo2.png
+++ b/src/assets/img/head/kelley-logo2.png
--- a/src/assets/img/index-background.png
+++ b/src/assets/img/index-background.png
--- a/src/assets/img/index_background.jpg
+++ b/src/assets/img/index_background.jpg
--- a/src/assets/img/index_slogo.png
+++ b/src/assets/img/index_slogo.png
--- a/src/assets/img/know.png
+++ b/src/assets/img/know.png
--- a/src/assets/img/lang/banner-arl.png
+++ b/src/assets/img/lang/banner-arl.png
--- a/src/assets/img/lang/banner-arr.png
+++ b/src/assets/img/lang/banner-arr.png
--- a/src/assets/img/lang/banner-i1.png
+++ b/src/assets/img/lang/banner-i1.png
--- a/src/assets/img/lang/banner-i2.png
+++ b/src/assets/img/lang/banner-i2.png
--- a/src/assets/img/lang/banner-i3.png
+++ b/src/assets/img/lang/banner-i3.png
--- a/src/assets/img/lang/banner-i4.png
+++ b/src/assets/img/lang/banner-i4.png
--- a/src/assets/img/lang/banner-i5.png
+++ b/src/assets/img/lang/banner-i5.png
--- a/src/assets/img/lang/banner-img1.png
+++ b/src/assets/img/lang/banner-img1.png
--- a/src/assets/img/lang/home-s-icon1.png
+++ b/src/assets/img/lang/home-s-icon1.png
--- a/src/assets/img/lang/home-s-icon2.png
+++ b/src/assets/img/lang/home-s-icon2.png
--- a/src/assets/img/lang/home-s-icon3.png
+++ b/src/assets/img/lang/home-s-icon3.png
--- a/src/assets/img/lang/home-s-icon4.png
+++ b/src/assets/img/lang/home-s-icon4.png
--- a/src/assets/img/lang/home-s-icon5.png
+++ b/src/assets/img/lang/home-s-icon5.png
--- a/src/assets/img/lang/m2-bg.png
+++ b/src/assets/img/lang/m2-bg.png
--- a/src/assets/img/lang/m3-bg.png
+++ b/src/assets/img/lang/m3-bg.png
--- a/src/assets/img/lang/m3-btn.png
+++ b/src/assets/img/lang/m3-btn.png
--- a/src/assets/img/logo.png
+++ b/src/assets/img/logo.png
--- a/src/assets/img/project.png
+++ b/src/assets/img/project.png
--- a/src/assets/img/project/item1-op.png
+++ b/src/assets/img/project/item1-op.png
--- a/src/assets/img/project/item2-photo.png
+++ b/src/assets/img/project/item2-photo.png
--- a/src/assets/img/project/item3-i1.png
+++ b/src/assets/img/project/item3-i1.png
--- a/src/assets/img/project/item3-i2.png
+++ b/src/assets/img/project/item3-i2.png
--- a/src/assets/img/project/item3-i3.png
+++ b/src/assets/img/project/item3-i3.png
--- a/src/assets/img/project/item3-i4.png
+++ b/src/assets/img/project/item3-i4.png
--- a/src/assets/img/project/m1-bg.png
+++ b/src/assets/img/project/m1-bg.png
--- a/src/assets/img/recruitInfo/alumni-m1-i1.png
+++ b/src/assets/img/recruitInfo/alumni-m1-i1.png
--- a/src/assets/img/recruitInfo/banner.png
+++ b/src/assets/img/recruitInfo/banner.png
--- a/src/assets/img/recruitInfo/m1-c1-icon1.png
+++ b/src/assets/img/recruitInfo/m1-c1-icon1.png
--- a/src/assets/img/recruitInfo/m1-c1-img1.png
+++ b/src/assets/img/recruitInfo/m1-c1-img1.png
--- a/src/assets/img/recruitInfo/m1-c1-img2.png
+++ b/src/assets/img/recruitInfo/m1-c1-img2.png
--- a/src/assets/img/recruitInfo/m1-c1-img3.png
+++ b/src/assets/img/recruitInfo/m1-c1-img3.png
--- a/src/assets/img/recruitInfo/m2-c1-img1.png
+++ b/src/assets/img/recruitInfo/m2-c1-img1.png
--- a/src/assets/img/recruitInfo/m2-c1-img2.png
+++ b/src/assets/img/recruitInfo/m2-c1-img2.png
--- a/src/assets/img/recruitInfo/setcou-m1-bg.png
+++ b/src/assets/img/recruitInfo/setcou-m1-bg.png
--- a/src/assets/img/teaching/m2-r-img.png
+++ b/src/assets/img/teaching/m2-r-img.png
--- a/src/assets/img/wxpay.png
+++ b/src/assets/img/wxpay.png
--- a/src/assets/img/zijing.png
+++ b/src/assets/img/zijing.png
--- a/src/assets/js/api.js
+++ b/src/assets/js/api.js
--- a/src/assets/js/config.js
+++ b/src/assets/js/config.js
--- a/src/assets/languages/en.json
+++ b/src/assets/languages/en.json
--- a/src/assets/languages/index.js
+++ b/src/assets/languages/index.js
--- a/src/assets/languages/language.js
+++ b/src/assets/languages/language.js
--- a/src/assets/languages/zh-CN.json
+++ b/src/assets/languages/zh-CN.json
--- a/src/assets/svg/api.svg
+++ b/src/assets/svg/api.svg
--- a/src/assets/svg/js.svg
+++ b/src/assets/svg/js.svg
--- a/src/assets/svg/userNew.svg
+++ b/src/assets/svg/userNew.svg
--- a/src/assets/svg/userOld.svg
+++ b/src/assets/svg/userOld.svg
--- a/src/components/Logo.vue
+++ b/src/components/Logo.vue
--- a/src/components/ProjectContent.vue
+++ b/src/components/ProjectContent.vue
--- a/src/components/ProjectTitle.vue
+++ b/src/components/ProjectTitle.vue
--- a/src/components/SignUp.vue
+++ b/src/components/SignUp.vue
--- a/src/components/SvgIcon/svgicon.vue
+++ b/src/components/SvgIcon/svgicon.vue
--- a/src/components/before/globalVariable.js
+++ b/src/components/before/globalVariable.js
--- a/src/components/before/index.js
+++ b/src/components/before/index.js
--- a/src/components/beforeEnter/Before.js
+++ b/src/components/beforeEnter/Before.js
--- a/src/components/beforeEnter/index.js
+++ b/src/components/beforeEnter/index.js
--- a/src/components/button-list.vue
+++ b/src/components/button-list.vue
--- a/src/components/countdown.vue
+++ b/src/components/countdown.vue
--- a/src/components/errorPages/404.vue
+++ b/src/components/errorPages/404.vue
--- a/src/components/errorPages/500.vue
+++ b/src/components/errorPages/500.vue
--- a/src/components/form.vue
+++ b/src/components/form.vue
--- a/src/components/input.vue
+++ b/src/components/input.vue
--- a/src/components/languageSwitch/index.vue
+++ b/src/components/languageSwitch/index.vue
--- a/src/components/layout-register.vue
+++ b/src/components/layout-register.vue
--- a/src/components/layout/components/slider.vue
+++ b/src/components/layout/components/slider.vue
--- a/src/components/layout/components/tab.vue
+++ b/src/components/layout/components/tab.vue
--- a/src/components/layout/index.vue
+++ b/src/components/layout/index.vue
--- a/src/components/leavex/index.vue
+++ b/src/components/leavex/index.vue
--- a/src/components/login/code/code.vue
+++ b/src/components/login/code/code.vue
--- a/src/components/login/forget/forget.vue
+++ b/src/components/login/forget/forget.vue
--- a/src/components/login/img/login-left-bg.png
+++ b/src/components/login/img/login-left-bg.png
--- a/src/components/login/img/logo.png
+++ b/src/components/login/img/logo.png
--- a/src/components/login/login.css
+++ b/src/components/login/login.css
--- a/src/components/login/login.vue
+++ b/src/components/login/login.vue
--- a/src/components/login/normal/normal.vue
+++ b/src/components/login/normal/normal.vue
--- a/src/components/page-footer/index.vue
+++ b/src/components/page-footer/index.vue
--- a/src/components/page-header.vue
+++ b/src/components/page-header.vue
--- a/src/components/pasInput.vue
+++ b/src/components/pasInput.vue
--- a/src/components/sendCode.vue
+++ b/src/components/sendCode.vue
--- a/src/components/signup/enrol/treaty.vue
+++ b/src/components/signup/enrol/treaty.vue
--- a/src/components/slide-list.vue
+++ b/src/components/slide-list.vue
--- a/src/style.scss
+++ b/src/style.scss
--- a/src/components/tab/bannerTab.vue
+++ b/src/components/tab/bannerTab.vue
--- a/src/components/tab/childTab.vue
+++ b/src/components/tab/childTab.vue
--- a/src/components/tab/newsList.vue
+++ b/src/components/tab/newsList.vue
--- a/src/components/tab/teachingList.vue
+++ b/src/components/tab/teachingList.vue
--- a/src/directive/scroll.js
+++ b/src/directive/scroll.js
--- a/src/icons/index.js
+++ b/src/icons/index.js
--- a/src/icons/svg/test.svg
+++ b/src/icons/svg/test.svg
--- a/src/icons/svg/user.svg
+++ b/src/icons/svg/user.svg
--- a/src/index.html
+++ b/src/index.html
--- a/src/main.js
+++ b/src/main.js
--- a/src/main.vue
+++ b/src/main.vue
--- a/src/modules/index.js
+++ b/src/modules/index.js
--- a/src/modules/test-module/action/TestModuleAction.js
+++ b/src/modules/test-module/action/TestModuleAction.js
--- a/src/modules/test-module/action/index.js
+++ b/src/modules/test-module/action/index.js
--- a/src/modules/test-module/api/index.js
+++ b/src/modules/test-module/api/index.js
--- a/src/modules/test-module/api/login_module_api.js
+++ b/src/modules/test-module/api/login_module_api.js
--- a/src/modules/test-module/assets/font-icons/demo.css
+++ b/src/modules/test-module/assets/font-icons/demo.css
--- a/src/modules/test-module/assets/font-icons/demo_index.html
+++ b/src/modules/test-module/assets/font-icons/demo_index.html
--- a/src/modules/test-module/assets/font-icons/iconfont.css
+++ b/src/modules/test-module/assets/font-icons/iconfont.css
--- a/src/modules/test-module/assets/font-icons/iconfont.eot
+++ b/src/modules/test-module/assets/font-icons/iconfont.eot
--- a/src/modules/test-module/assets/font-icons/iconfont.js
+++ b/src/modules/test-module/assets/font-icons/iconfont.js
--- a/src/modules/test-module/assets/font-icons/iconfont.json
+++ b/src/modules/test-module/assets/font-icons/iconfont.json
--- a/src/modules/test-module/assets/font-icons/iconfont.svg
+++ b/src/modules/test-module/assets/font-icons/iconfont.svg
--- a/src/modules/test-module/assets/font-icons/iconfont.ttf
+++ b/src/modules/test-module/assets/font-icons/iconfont.ttf
--- a/src/modules/test-module/assets/font-icons/iconfont.woff
+++ b/src/modules/test-module/assets/font-icons/iconfont.woff
--- a/src/modules/test-module/assets/font-icons/iconfont.woff2
+++ b/src/modules/test-module/assets/font-icons/iconfont.woff2
--- a/src/modules/test-module/assets/images/logo.png
+++ b/src/modules/test-module/assets/images/logo.png
--- a/src/modules/test-module/assets/languages/en.json
+++ b/src/modules/test-module/assets/languages/en.json
--- a/src/modules/test-module/assets/languages/index.js
+++ b/src/modules/test-module/assets/languages/index.js
--- a/src/modules/test-module/assets/languages/language.js
+++ b/src/modules/test-module/assets/languages/language.js
--- a/src/modules/test-module/assets/languages/zh-CN.json
+++ b/src/modules/test-module/assets/languages/zh-CN.json
--- a/src/modules/test-module/index.js
+++ b/src/modules/test-module/index.js
--- a/src/modules/test-module/index.scss
+++ b/src/modules/test-module/index.scss
--- a/src/modules/test-module/src/TestModule.vue
+++ b/src/modules/test-module/src/TestModule.vue
--- a/src/pages/README.md
+++ b/src/pages/README.md
--- a/src/pages/_lang/index.vue
+++ b/src/pages/_lang/index.vue
--- a/src/pages/_lang/preview.vue
+++ b/src/pages/_lang/preview.vue
--- a/src/pages/alumniWork/index.vue
+++ b/src/pages/alumniWork/index.vue
--- a/src/pages/apply-for/index.vue
+++ b/src/pages/apply-for/index.vue
--- a/src/pages/apply/filterType.json
+++ b/src/pages/apply/filterType.json
--- a/src/pages/apply/index.vue
+++ b/src/pages/apply/index.vue
--- a/src/pages/careerDev/index.vue
+++ b/src/pages/careerDev/index.vue
--- a/src/pages/contact-us/index.vue
+++ b/src/pages/contact-us/index.vue
--- a/src/pages/contact/index.vue
+++ b/src/pages/contact/index.vue
--- a/src/pages/details-news/index.vue
+++ b/src/pages/details-news/index.vue
--- a/src/pages/download/index.vue
+++ b/src/pages/download/index.vue
--- a/src/pages/forgetPsw/filterType.json
+++ b/src/pages/forgetPsw/filterType.json
--- a/src/pages/forgetPsw/index.vue
+++ b/src/pages/forgetPsw/index.vue
--- a/src/pages/homepage/index.vue
+++ b/src/pages/homepage/index.vue
--- a/src/pages/homepage/mixins/dyHeight.js
+++ b/src/pages/homepage/mixins/dyHeight.js
--- a/src/pages/homepage/mixins/index.js
+++ b/src/pages/homepage/mixins/index.js
--- a/src/pages/index.vue
+++ b/src/pages/index.vue
--- a/src/pages/know/index.vue
+++ b/src/pages/know/index.vue
--- a/src/pages/letter/index.vue
+++ b/src/pages/letter/index.vue
--- a/src/pages/login/components/NormalLogin.vue
+++ b/src/pages/login/components/NormalLogin.vue
--- a/src/pages/login/components/action/LoginAction.js
+++ b/src/pages/login/components/action/LoginAction.js
--- a/src/pages/login/components/action/index.js
+++ b/src/pages/login/components/action/index.js
--- a/src/pages/login/components/api/index.js
+++ b/src/pages/login/components/api/index.js
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
--- a/src/pages/major-set/filterType.json
+++ b/src/pages/major-set/filterType.json
--- a/src/pages/major-set/index.vue
+++ b/src/pages/major-set/index.vue
--- a/src/pages/my/account/home.vue
+++ b/src/pages/my/account/home.vue
--- a/src/pages/my/account/index.vue
+++ b/src/pages/my/account/index.vue
--- a/src/pages/my/account/info.vue
+++ b/src/pages/my/account/info.vue
--- a/src/pages/my/account/password.vue
+++ b/src/pages/my/account/password.vue
--- a/src/pages/my/admission/form/index.js
+++ b/src/pages/my/admission/form/index.js
--- a/src/pages/my/admission/form/xfjn.js
+++ b/src/pages/my/admission/form/xfjn.js
--- a/src/pages/my/admission/form/xy.js
+++ b/src/pages/my/admission/form/xy.js
--- a/src/pages/my/admission/index.vue
+++ b/src/pages/my/admission/index.vue
--- a/src/pages/my/application/complete.vue
+++ b/src/pages/my/application/complete.vue
--- a/src/pages/my/application/form/declare.js
+++ b/src/pages/my/application/form/declare.js
--- a/src/pages/my/application/form/index.js
+++ b/src/pages/my/application/form/index.js
--- a/src/pages/my/application/form/info.js
+++ b/src/pages/my/application/form/info.js
--- a/src/pages/my/application/form/info/answer.js
+++ b/src/pages/my/application/form/info/answer.js
--- a/src/pages/my/application/form/info/career.js
+++ b/src/pages/my/application/form/info/career.js
--- a/src/pages/my/application/form/info/country.js
+++ b/src/pages/my/application/form/info/country.js
--- a/src/pages/my/application/form/info/education.js
+++ b/src/pages/my/application/form/info/education.js
--- a/src/pages/my/application/form/info/first.js
+++ b/src/pages/my/application/form/info/first.js
--- a/src/pages/my/application/form/info/honor.js
+++ b/src/pages/my/application/form/info/honor.js
--- a/src/pages/my/application/form/info/profile.js
+++ b/src/pages/my/application/form/info/profile.js
--- a/src/pages/my/application/form/info/training.js
+++ b/src/pages/my/application/form/info/training.js
--- a/src/pages/my/application/form/tjx.js
+++ b/src/pages/my/application/form/tjx.js
--- a/src/pages/my/application/form/wfzzm.js
+++ b/src/pages/my/application/form/wfzzm.js
--- a/src/pages/my/application/index.vue
+++ b/src/pages/my/application/index.vue
--- a/src/pages/my/application/pay.vue
+++ b/src/pages/my/application/pay.vue
--- a/src/pages/my/application/preview.vue
+++ b/src/pages/my/application/preview.vue
--- a/src/pages/my/interview/form/byz.js
+++ b/src/pages/my/interview/form/byz.js
--- a/src/pages/my/interview/form/cjd.js
+++ b/src/pages/my/interview/form/cjd.js
--- a/src/pages/my/interview/form/index.js
+++ b/src/pages/my/interview/form/index.js
--- a/src/pages/my/interview/form/zp.js
+++ b/src/pages/my/interview/form/zp.js
--- a/src/pages/my/interview/index.vue
+++ b/src/pages/my/interview/index.vue
--- a/src/pages/my/layout.vue
+++ b/src/pages/my/layout.vue
--- a/src/pages/my/welcome/index.vue
+++ b/src/pages/my/welcome/index.vue
--- a/src/pages/my/welcome/indexPay.vue
+++ b/src/pages/my/welcome/indexPay.vue
--- a/src/pages/my/welcome/indexWelcome.vue
+++ b/src/pages/my/welcome/indexWelcome.vue
--- a/src/pages/news/index.vue
+++ b/src/pages/news/index.vue
--- a/src/pages/presence/index.vue
+++ b/src/pages/presence/index.vue
--- a/src/pages/project/index.vue
+++ b/src/pages/project/index.vue
--- a/src/pages/recent-news/index.vue
+++ b/src/pages/recent-news/index.vue
--- a/src/pages/recruitInfo/apply.vue
+++ b/src/pages/recruitInfo/apply.vue
--- a/src/pages/recruitInfo/index.vue
+++ b/src/pages/recruitInfo/index.vue
--- a/src/pages/recruitInfo/signUp.vue
+++ b/src/pages/recruitInfo/signUp.vue
--- a/src/pages/recruitInfo/support.vue
+++ b/src/pages/recruitInfo/support.vue
--- a/src/pages/redirect/index.vue
+++ b/src/pages/redirect/index.vue
--- a/src/pages/register/filterType.json
+++ b/src/pages/register/filterType.json
--- a/src/pages/register/index.vue
+++ b/src/pages/register/index.vue
--- a/src/pages/signup/form.vue
+++ b/src/pages/signup/form.vue
--- a/src/pages/signup/form/answer.js
+++ b/src/pages/signup/form/answer.js
--- a/src/pages/signup/form/attachment.js
+++ b/src/pages/signup/form/attachment.js
--- a/src/pages/signup/form/career.js
+++ b/src/pages/signup/form/career.js
--- a/src/pages/signup/form/declare.js
+++ b/src/pages/signup/form/declare.js
--- a/src/pages/signup/form/education.js
+++ b/src/pages/signup/form/education.js
--- a/src/pages/signup/form/honor.js
+++ b/src/pages/signup/form/honor.js
--- a/src/pages/signup/form/index.js
+++ b/src/pages/signup/form/index.js
--- a/src/pages/signup/form/pay.js
+++ b/src/pages/signup/form/pay.js
--- a/src/pages/signup/form/profile.js
+++ b/src/pages/signup/form/profile.js
--- a/src/pages/signup/form/training.js
+++ b/src/pages/signup/form/training.js
--- a/src/pages/signup/index.vue
+++ b/src/pages/signup/index.vue
--- a/src/pages/signup/loca.vue
+++ b/src/pages/signup/loca.vue
--- a/src/pages/teaching/index.vue
+++ b/src/pages/teaching/index.vue
--- a/src/pages/teaching/setCourse.vue
+++ b/src/pages/teaching/setCourse.vue
--- a/src/pages/test.vue
+++ b/src/pages/test.vue
--- a/src/app.vue
+++ b/src/app.vue
--- a/src/pages/videoCenter/index.vue
+++ b/src/pages/videoCenter/index.vue
--- a/src/pages/videoCenter/list.vue
+++ b/src/pages/videoCenter/list.vue
--- a/src/router/index.js
+++ b/src/router/index.js
--- a/src/router/routes.js
+++ b/src/router/routes.js
--- a/src/store/index.js
+++ b/src/store/index.js
--- a/src/utils/validate.js
+++ b/src/utils/validate.js