Merge branch 'feature-2.0' of ssh://git.mooctest.com:1022/crowd-2019/crowd-test-service-front into feature-2.0

build/webpack.prod.conf.js

@@ -33,20 +33,31 @@ const webpackConfig = merge(baseWebpackConfig, {
       'process.env': env
     }),
     new UglifyJsPlugin({
+      // uglifyOptions: {
+      //   compress: {
+      //     warnings: false
+      //   }
+      // },
+      // sourceMap: config.build.productionSourceMap,
+      // parallel: true
+      parallel: 4,
       uglifyOptions: {
+        output: {
+          comments: false,
+          beautify: false,
+        },
         compress: {
           warnings: false
-        }
+        },
       },
-      sourceMap: config.build.productionSourceMap,
-      parallel: true
+      cache: true,
     }),
     // extract css into its own file
     new ExtractTextPlugin({
       filename: utils.assetsPath('css/[name].[contenthash].css'),
       // Setting the following option to `false` will not extract CSS from codesplit chunks.
       // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack.
-      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, 
+      // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`,
       // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110
       allChunks: true,
     }),

src/pages/HomepageSearch/ExpertList.vue

@@ -164,7 +164,7 @@
         let url = '/api/common/index/page';
         let params = {
           "keyword": this.searchVal,
-          "activePage": 1,
+          "activePage": this.activePage,
           "columnFilters": [
             {
               "field": "type",