From fdab0e6768f443fc86ca92419d2fae8d352d0661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 22 Oct 2019 09:27:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AFbuild=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/config/env.js                    |   4 +-
 public/react/config/webpack.config.prod.js    | 692 +++++++++---------
 public/react/package.json                     |   1 +
 public/react/src/App.js                       |  62 +-
 .../competitimain/CompetitionsIndex.js        | 119 +--
 .../competitions/competitimain/groups1.png    | Bin 0 -> 3275 bytes
 .../competitions/competitimain/groups2.png    | Bin 0 -> 4820 bytes
 .../competitions/competitimain/groups3.png    | Bin 0 -> 3671 bytes
 8 files changed, 471 insertions(+), 407 deletions(-)
 create mode 100644 public/react/src/modules/competitions/competitimain/groups1.png
 create mode 100644 public/react/src/modules/competitions/competitimain/groups2.png
 create mode 100644 public/react/src/modules/competitions/competitimain/groups3.png

diff --git a/public/react/config/env.js b/public/react/config/env.js
index aef6a8ff4..d76de4ce1 100644
--- a/public/react/config/env.js
+++ b/public/react/config/env.js
@@ -7,7 +7,7 @@ const paths = require('./paths');
 // Make sure that including paths.js after env.js will read .env variables.
 delete require.cache[require.resolve('./paths')];
 
-const NODE_ENV = process.env.NODE_ENV;
+const NODE_ENV = "production";
 if (!NODE_ENV) {
   throw new Error(
     'The NODE_ENV environment variable is required but was not specified.'
@@ -71,7 +71,7 @@ function getClientEnvironment(publicUrl) {
       {
         // Useful for determining whether we’re running in production mode.
         // Most importantly, it switches React into the correct mode.
-        NODE_ENV: process.env.NODE_ENV || 'development',
+        NODE_ENV: "production",
         // Useful for resolving the correct path to static assets in `public`.
         // For example, <img src={process.env.PUBLIC_URL + '/img/logo.png'} />.
         // This should only be used as an escape hatch. Normally you would put
diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js
index 33c778d45..22bf615ad 100644
--- a/public/react/config/webpack.config.prod.js
+++ b/public/react/config/webpack.config.prod.js
@@ -11,7 +11,6 @@ const SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin');
 const eslintFormatter = require('react-dev-utils/eslintFormatter');
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
 const ParallelUglifyPlugin = require('webpack-parallel-uglify-plugin');
-
 const paths = require('./paths');
 const getClientEnvironment = require('./env');
 
@@ -33,7 +32,7 @@ const env = getClientEnvironment(publicUrl);
 // Assert this just to be safe.
 // Development builds of React are slow and not intended for production.
 if (env.stringified['process.env'].NODE_ENV !== '"production"') {
-  throw new Error('Production builds must have NODE_ENV=production.');
+	throw new Error('Production builds must have NODE_ENV=production.');
 }
 
 // Note: defined here because it will be used more than once.
@@ -44,9 +43,9 @@ const cssFilename = './static/css/[name].[contenthash:8].css';
 // However, our output is structured with css, js and media folders.
 // To have this structure working with relative paths, we have to use custom options.
 const extractTextPluginOptions = shouldUseRelativeAssetPaths
-  ? // Making sure that the publicPath goes back to to build folder.
-    { publicPath: Array(cssFilename.split('/').length).join('../') }
-  : {};
+	? // Making sure that the publicPath goes back to to build folder.
+	{ publicPath: Array(cssFilename.split('/').length).join('../') }
+	: {};
 
 // This is the production configuration.
 // It compiles slowly and is focused on producing a fast and minimal bundle.
@@ -54,332 +53,365 @@ const extractTextPluginOptions = shouldUseRelativeAssetPaths
 // 上线用的
 // console.log('publicPath ', publicPath)
 module.exports = {
-  // externals: {
-  //   'react': 'window.React'
-  // },
-  // Don't attempt to continue if there are any errors.
-  bail: true,
-  // We generate sourcemaps in production. This is slow but gives good results.
-  // You can exclude the *.map files from the build during deployment.
-  //  devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
-	devtool: shouldUseSourceMap ? 'source-map' : false,//测试版
-  // In production, we only want to load the polyfills and the app code.
-  entry: [require.resolve('./polyfills'), paths.appIndexJs],
-  output: {
-    // The build folder.
-    path: paths.appBuild,
-    // Generated JS file names (with nested folders).
-    // There will be one main bundle, and one file per asynchronous chunk.
-    // We don't currently advertise code splitting but Webpack supports it.
-    filename: './static/js/[name].[chunkhash:8].js',
-    chunkFilename: './static/js/[name].[chunkhash:8].chunk.js',
-    // We inferred the "public path" (such as / or /my-project) from homepage.
-    // cdn
-    // publicPath: 'https://shixun.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
-    // publicPath: 'https://cdn-testeduplus2.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
-    publicPath: '/react/build/', //publicPath,   https://cdn.educoder.net
-    
-    // Point sourcemap entries to original disk location (format as URL on Windows)
-    devtoolModuleFilenameTemplate: info =>
-      path
-        .relative(paths.appSrc, info.absoluteResourcePath)
-        .replace(/\\/g, '/'),
-  },
-  resolve: {
-    // This allows you to set a fallback for where Webpack should look for modules.
-    // We placed these paths second because we want `node_modules` to "win"
-    // if there are any conflicts. This matches Node resolution mechanism.
-    // https://github.com/facebookincubator/create-react-app/issues/253
-    modules: ['node_modules', paths.appNodeModules].concat(
-      // It is guaranteed to exist because we tweak it in `env.js`
-      process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
-    ),
-    // These are the reasonable defaults supported by the Node ecosystem.
-    // We also include JSX as a common component filename extension to support
-    // some tools, although we do not recommend using it, see:
-    // https://github.com/facebookincubator/create-react-app/issues/290
-    // `web` extension prefixes have been added for better support
-    // for React Native Web.
-    extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
-    alias: {
-      "educoder": __dirname + "/../src/common/educoder.js",
-      // Support React Native Web
-      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
-    },
-    plugins: [
-      // Prevents users from importing files from outside of src/ (or node_modules/).
-      // This often causes confusion because we only process files within src/ with babel.
-      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-      // please link the files into your node_modules/ and let module-resolution kick in.
-      // Make sure your source files are compiled, as they will not be processed in any way.
-      new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-    ],
-  },
-  module: {
-    strictExportPresence: true,
-    rules: [
-      // TODO: Disable require.ensure as it's not a standard language feature.
-      // We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
-      // { parser: { requireEnsure: false } },
+	// externals: {
+	//   'react': 'window.React'
+	// },
+	// Don't attempt to continue if there are any errors.
+	bail: true,
+	// We generate sourcemaps in production. This is slow but gives good results.
+	// You can exclude the *.map files from the build during deployment.
+	//  devtool: shouldUseSourceMap ? 'nosources-source-map' : false,  //正式版
+	devtool: false,//测试版
+	// In production, we only want to load the polyfills and the app code.
+	// entry: [require.resolve('./polyfills'), paths.appIndexJs],
+	entry: {
+		main:[require.resolve('./polyfills'), paths.appIndexJs],
+		vendor: [
+			'moment', 'react', 'react-dom','react-router-dom','antd','@icedesign/base','@novnc/novnc','array-flatten','axios',
+			'material-ui','monaco-editor','react-monaco-editor', 'echarts',"qs"
+		],
+	},
+	output: {
+		// The build folder.
+		path: paths.appBuild,
+		// Generated JS file names (with nested folders).
+		// There will be one main bundle, and one file per asynchronous chunk.
+		// We don't currently advertise code splitting but Webpack supports it.
+		filename: './static/js/[name].[chunkhash:8].js',
+		chunkFilename: './static/js/[name].[chunkhash:8].chunk.js',
+		// We inferred the "public path" (such as / or /my-project) from homepage.
+		// cdn
+		// publicPath: 'https://shixun.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
+		// publicPath: 'https://cdn-testeduplus2.educoder.net/react/build/', //publicPath,   https://cdn.educoder.net
+		publicPath: '/react/build/', //publicPath,   https://cdn.educoder.net
+
+		// Point sourcemap entries to original disk location (format as URL on Windows)
+		devtoolModuleFilenameTemplate: info =>
+			path
+				.relative(paths.appSrc, info.absoluteResourcePath)
+				.replace(/\\/g, '/'),
+	},
+	resolve: {
+		// This allows you to set a fallback for where Webpack should look for modules.
+		// We placed these paths second because we want `node_modules` to "win"
+		// if there are any conflicts. This matches Node resolution mechanism.
+		// https://github.com/facebookincubator/create-react-app/issues/253
+		modules: ['node_modules', paths.appNodeModules].concat(
+			// It is guaranteed to exist because we tweak it in `env.js`
+			process.env.NODE_PATH.split(path.delimiter).filter(Boolean)
+		),
+		// These are the reasonable defaults supported by the Node ecosystem.
+		// We also include JSX as a common component filename extension to support
+		// some tools, although we do not recommend using it, see:
+		// https://github.com/facebookincubator/create-react-app/issues/290
+		// `web` extension prefixes have been added for better support
+		// for React Native Web.
+		extensions: ['.web.js', '.mjs', '.js', '.json', '.web.jsx', '.jsx'],
+		alias: {
+			"educoder": __dirname + "/../src/common/educoder.js",
+			// Support React Native Web
+			// https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
+			'react-native': 'react-native-web',
+		},
+		plugins: [
+			// Prevents users from importing files from outside of src/ (or node_modules/).
+			// This often causes confusion because we only process files within src/ with babel.
+			// To fix this, we prevent you from importing files out of src/ -- if you'd like to,
+			// please link the files into your node_modules/ and let module-resolution kick in.
+			// Make sure your source files are compiled, as they will not be processed in any way.
+			new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
+		],
+	},
+	module: {
+		strictExportPresence: true,
+		rules: [
+			// TODO: Disable require.ensure as it's not a standard language feature.
+			// We are waiting for https://github.com/facebookincubator/create-react-app/issues/2176.
+			// { parser: { requireEnsure: false } },
+
+			// First, run the linter.
+			// It's important to do this before Babel processes the JS.
+			{
+				test: /\.(js|jsx|mjs)$/,
+				enforce: 'pre',
+				use: [
+					{
+						options: {
+							formatter: eslintFormatter,
+							eslintPath: require.resolve('eslint'),
+
+						},
+						loader: require.resolve('eslint-loader'),
+					},
+				],
+				include: paths.appSrc,
+			},
+			{
+				// "oneOf" will traverse all following loaders until one will
+				// match the requirements. When no loader matches it will fall
+				// back to the "file" loader at the end of the loader list.
+				oneOf: [
+					// "url" loader works just like "file" loader but it also embeds
+					// assets smaller than specified size as data URLs to avoid requests.
+					{
+						test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
+						loader: require.resolve('url-loader'),
+						options: {
+							limit: 10000,
+							name: 'static/media/[name].[hash:8].[ext]',
+						},
+					},
+					// Process JS with Babel.
+					{
+						test: /\.(js|jsx|mjs)$/,
+						include: paths.appSrc,
+						loader: require.resolve('babel-loader'),
+						options: {
+
+							compact: true,
+						},
+					},
+					// The notation here is somewhat confusing.
+					// "postcss" loader applies autoprefixer to our CSS.
+					// "css" loader resolves paths in CSS and adds assets as dependencies.
+					// "style" loader normally turns CSS into JS modules injecting <style>,
+					// but unlike in development configuration, we do something different.
+					// `ExtractTextPlugin` first applies the "postcss" and "css" loaders
+					// (second argument), then grabs the result CSS and puts it into a
+					// separate file in our build process. This way we actually ship
+					// a single CSS file in production instead of JS code injecting <style>
+					// tags. If you use code splitting, however, any async bundles will still
+					// use the "style" loader inside the async code so CSS from them won't be
+					// in the main CSS file.
+					{
+						test: /\.css$/,
+						loader: ExtractTextPlugin.extract(
+							Object.assign(
+								{
+									fallback: {
+										loader: require.resolve('style-loader'),
+										options: {
+											hmr: false,
+										},
+									},
+									use: [
+										{
+											loader: require.resolve('css-loader'),
+											options: {
+												importLoaders: 1,
+												minimize: true,
+												sourceMap: shouldUseSourceMap,
+											},
+										},
+										{
+											loader: require.resolve('postcss-loader'),
+											options: {
+												// Necessary for external CSS imports to work
+												// https://github.com/facebookincubator/create-react-app/issues/2677
+												ident: 'postcss',
+												plugins: () => [
+													require('postcss-flexbugs-fixes'),
+													autoprefixer({
+														browsers: [
+															'>1%',
+															'last 4 versions',
+															'Firefox ESR',
+															'not ie < 9', // React doesn't support IE8 anyway
+														],
+														flexbox: 'no-2009',
+													}),
+												],
+											},
+										},
+									],
+								},
+								extractTextPluginOptions
+							)
+						),
+						// Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
+					},
+					{
+						test: /\.scss$/,
+						use: [
+							require.resolve("style-loader"),
+							{
+								loader: require.resolve("css-loader"),
+								options: {
+									importLoaders: 1,
+									minimize: true,
+									sourceMap: shouldUseSourceMap,
+								},
+							},
+							{
+								loader: require.resolve("sass-loader")
+							}
+						],
+					},
+					// "file" loader makes sure assets end up in the `build` folder.
+					// When you `import` an asset, you get its filename.
+					// This loader doesn't use a "test" so it will catch all modules
+					// that fall through the other loaders.
+					{
+						loader: require.resolve('file-loader'),
+						// Exclude `js` files to keep "css" loader working as it injects
+						// it's runtime that would otherwise processed through "file" loader.
+						// Also exclude `html` and `json` extensions so they get processed
+						// by webpacks internal loaders.
+						exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
+						options: {
+							name: 'static/media/[name].[hash:8].[ext]',
+						},
+					},
+					// ** STOP ** Are you adding a new loader?
+					// Make sure to add the new loader(s) before the "file" loader.
+				],
+			},
+		],
+	},
+	plugins: [
+		// Makes some environment variables available in index.html.
+		// The public URL is available as %PUBLIC_URL% in index.html, e.g.:
+		// <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
+		// In production, it will be an empty string unless you specify "homepage"
+		// in `package.json`, in which case it will be the pathname of that URL.
+		new InterpolateHtmlPlugin(env.raw),
+		new webpack.HashedModuleIdsPlugin(),
 
-      // First, run the linter.
-      // It's important to do this before Babel processes the JS.
-      {
-        test: /\.(js|jsx|mjs)$/,
-        enforce: 'pre',
-        use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
+		// new webpack.optimize.ModuleConcatenationPlugin(),
 
-            },
-            loader: require.resolve('eslint-loader'),
-          },
-        ],
-        include: paths.appSrc,
-      },
-      {
-        // "oneOf" will traverse all following loaders until one will
-        // match the requirements. When no loader matches it will fall
-        // back to the "file" loader at the end of the loader list.
-        oneOf: [
-          // "url" loader works just like "file" loader but it also embeds
-          // assets smaller than specified size as data URLs to avoid requests.
-          {
-            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-            loader: require.resolve('url-loader'),
-            options: {
-              limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-          // Process JS with Babel.
-          {
-            test: /\.(js|jsx|mjs)$/,
-            include: paths.appSrc,
-            loader: require.resolve('babel-loader'),
-            options: {
-              
-              compact: true,
-            },
-          },
-          // The notation here is somewhat confusing.
-          // "postcss" loader applies autoprefixer to our CSS.
-          // "css" loader resolves paths in CSS and adds assets as dependencies.
-          // "style" loader normally turns CSS into JS modules injecting <style>,
-          // but unlike in development configuration, we do something different.
-          // `ExtractTextPlugin` first applies the "postcss" and "css" loaders
-          // (second argument), then grabs the result CSS and puts it into a
-          // separate file in our build process. This way we actually ship
-          // a single CSS file in production instead of JS code injecting <style>
-          // tags. If you use code splitting, however, any async bundles will still
-          // use the "style" loader inside the async code so CSS from them won't be
-          // in the main CSS file.
-          {
-            test: /\.css$/,
-            loader: ExtractTextPlugin.extract(
-              Object.assign(
-                {
-                  fallback: {
-                    loader: require.resolve('style-loader'),
-                    options: {
-                      hmr: false,
-                    },
-                  },
-                  use: [
-                    {
-                      loader: require.resolve('css-loader'),
-                      options: {
-                        importLoaders: 1,
-                        minimize: true,
-                        sourceMap: shouldUseSourceMap,
-                      },
-                    },
-                    {
-                      loader: require.resolve('postcss-loader'),
-                      options: {
-                        // Necessary for external CSS imports to work
-                        // https://github.com/facebookincubator/create-react-app/issues/2677
-                        ident: 'postcss',
-                        plugins: () => [
-                          require('postcss-flexbugs-fixes'),
-                          autoprefixer({
-                            browsers: [
-                              '>1%',
-                              'last 4 versions',
-                              'Firefox ESR',
-                              'not ie < 9', // React doesn't support IE8 anyway
-                            ],
-                            flexbox: 'no-2009',
-                          }),
-                        ],
-                      },
-                    },
-                  ],
-                },
-                extractTextPluginOptions
-              )
-            ),
-            // Note: this won't work without `new ExtractTextPlugin()` in `plugins`.
-          },
-          {
-            test: /\.scss$/,
-            use: [
-              require.resolve("style-loader"),
-              {
-                loader: require.resolve("css-loader"),
-                options: {
-                  importLoaders: 1,
-                  minimize: true,
-                  sourceMap: shouldUseSourceMap,
-                },
-              },
-              {
-                loader: require.resolve("sass-loader")
-              }
-            ],
-          },
-          // "file" loader makes sure assets end up in the `build` folder.
-          // When you `import` an asset, you get its filename.
-          // This loader doesn't use a "test" so it will catch all modules
-          // that fall through the other loaders.
-          {
-            loader: require.resolve('file-loader'),
-            // Exclude `js` files to keep "css" loader working as it injects
-            // it's runtime that would otherwise processed through "file" loader.
-            // Also exclude `html` and `json` extensions so they get processed
-            // by webpacks internal loaders.
-            exclude: [/\.(js|jsx|mjs)$/, /\.html$/, /\.json$/],
-            options: {
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-          // ** STOP ** Are you adding a new loader?
-          // Make sure to add the new loader(s) before the "file" loader.
-        ],
-      },
-    ],
-  },
-  plugins: [
-    // Makes some environment variables available in index.html.
-    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    // In production, it will be an empty string unless you specify "homepage"
-    // in `package.json`, in which case it will be the pathname of that URL.
-    new InterpolateHtmlPlugin(env.raw),
-    // Generates an `index.html` file with the <script> injected.
-    new HtmlWebpackPlugin({
-      inject: true,
-      template: paths.appHtml,
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeRedundantAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true,
-      },
-    }),
-    // Makes some environment variables available to the JS code, for example:
-    // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-    // It is absolutely essential that NODE_ENV was set to production here.
-    // Otherwise React will be compiled in the very slow development mode.
-    new webpack.DefinePlugin(env.stringified),
-    // Minify the code.
-    // new webpack.optimize.UglifyJsPlugin({
-    //   compress: {
-    //     warnings: false,
-    //     // Disabled because of an issue with Uglify breaking seemingly valid code:
-    //     // https://github.com/facebookincubator/create-react-app/issues/2376
-    //     // Pending further investigation:
-    //     // https://github.com/mishoo/UglifyJS2/issues/2011
-    //     comparisons: false,
-    //   },
-    //   mangle: {
-    //     safari10: true,
-    //   },
-    //   output: {
-    //     comments: false,
-    //     // Turned on because emoji and regex is not minified properly using default
-    //     // https://github.com/facebookincubator/create-react-app/issues/2488
-    //     ascii_only: true,
-    //   },
-    //   sourceMap: shouldUseSourceMap,
-    // }),
-   //正式版上线后打开去掉debuger和console
-    new ParallelUglifyPlugin({
-      cacheDir: '.cache/',
-      uglifyJS:{
-        output: {
-          comments: false
-        },
-        warnings: false,
-        compress: {
-          drop_debugger: true,
+		new webpack.optimize.CommonsChunkPlugin({
+			async: 'async-vendor',
+			deepChildren: true,
+			minChunks: (module) => {
+				return /node_modules/.test(module.context);
+			},
+		}),
+
+		new webpack.optimize.CommonsChunkPlugin(
+			{names: ["vendors", "webpackAssets",'moment', 'react', 'react-dom','react-router-dom','antd','@icedesign/base','@novnc/novnc','array-flatten','axios',
+					'material-ui','monaco-editor','react-monaco-editor', 'echarts',"qs"]}
+		),
+
+		new webpack.optimize.CommonsChunkPlugin({
+			name: 'manifest',
+			minChunks: (module) => {
+				return /node_modules/.test(module.context);
+			},
+		}),
+
+		// Generates an `index.html` file with the <script> injected.
+		new HtmlWebpackPlugin({
+			inject: true,
+			template: paths.appHtml,
+			minify: {
+				removeComments: true,
+				collapseWhitespace: true,
+				removeRedundantAttributes: true,
+				useShortDoctype: true,
+				removeEmptyAttributes: true,
+				removeStyleLinkTypeAttributes: true,
+				keepClosingSlash: true,
+				minifyJS: true,
+				minifyCSS: true,
+				minifyURLs: true,
+			},
+		}),
+		// Makes some environment variables available to the JS code, for example:
+		// if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
+		// It is absolutely essential that NODE_ENV was set to production here.
+		// Otherwise React will be compiled in the very slow development mode.
+		new webpack.DefinePlugin(env.stringified),
+		// Minify the code.
+		// new webpack.optimize.UglifyJsPlugin({
+		//   compress: {
+		//     warnings: false,
+		//     // Disabled because of an issue with Uglify breaking seemingly valid code:
+		//     // https://github.com/facebookincubator/create-react-app/issues/2376
+		//     // Pending further investigation:
+		//     // https://github.com/mishoo/UglifyJS2/issues/2011
+		//     comparisons: false,
+		//   },
+		//   mangle: {
+		//     safari10: true,
+		//   },
+		//   output: {
+		//     comments: false,
+		//     // Turned on because emoji and regex is not minified properly using default
+		//     // https://github.com/facebookincubator/create-react-app/issues/2488
+		//     ascii_only: true,
+		//   },
+		//   sourceMap: shouldUseSourceMap,
+		// }),
+		//正式版上线后打开去掉debuger和console
+		new ParallelUglifyPlugin({
+			cacheDir: '.cache/',
+			uglifyJS:{
+				output: {
+					beautify: true,
+					comments: true,
+				},
+				warnings: false,
+				compress: {
+					drop_debugger: true,
 					drop_console: true
-        }
-      }
-    }),
-    // Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
-    new ExtractTextPlugin({
-      filename: cssFilename,
-    }),
-    // Generate a manifest file which contains a mapping of all asset filenames
-    // to their corresponding output file so that tools can pick it up without
-    // having to parse `index.html`.
-    new ManifestPlugin({
-      fileName: 'asset-manifest.json',
-    }),
-    // Generate a service worker script that will precache, and keep up to date,
-    // the HTML & assets that are part of the Webpack build.
-    new SWPrecacheWebpackPlugin({
-      // By default, a cache-busting query parameter is appended to requests
-      // used to populate the caches, to ensure the responses are fresh.
-      // If a URL is already hashed by Webpack, then there is no concern
-      // about it being stale, and the cache-busting can be skipped.
-      dontCacheBustUrlsMatching: /\.\w{8}\./,
-      filename: 'service-worker.js',
-      logger(message) {
-        if (message.indexOf('Total precache size is') === 0) {
-          // This message occurs for every build and is a bit too noisy.
-          return;
-        }
-        if (message.indexOf('Skipping static resource') === 0) {
-          // This message obscures real errors so we ignore it.
-          // https://github.com/facebookincubator/create-react-app/issues/2612
-          return;
-        }
-        // console.log(message);
-      },
-      minify: true,
-      // For unknown URLs, fallback to the index page
-      navigateFallback: publicUrl + '/index.html',
-      // Ignores URLs starting from /__ (useful for Firebase):
-      // https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
-      navigateFallbackWhitelist: [/^(?!\/__).*/],
-      // Don't precache sourcemaps (they're large) and build asset manifest:
-      staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
-    }),
-    // Moment.js is an extremely popular library that bundles large locale files
-    // by default due to how Webpack interprets its code. This is a practical
-    // solution that requires the user to opt into importing specific locales.
-    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-    // You can remove this if you don't use Moment.js:
-    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-  ],
-  // Some libraries import Node modules but don't use them in the browser.
-  // Tell Webpack to provide empty mocks for them so importing them works.
-  node: {
-    dgram: 'empty',
-    fs: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty',
-  },
+				}
+			}
+		}),
+		// Note: this won't work without ExtractTextPlugin.extract(..) in `loaders`.
+		new ExtractTextPlugin({
+			filename: cssFilename,
+		}),
+		// Generate a manifest file which contains a mapping of all asset filenames
+		// to their corresponding output file so that tools can pick it up without
+		// having to parse `index.html`.
+		new ManifestPlugin({
+			fileName: 'asset-manifest.json',
+		}),
+		// Generate a service worker script that will precache, and keep up to date,
+		// the HTML & assets that are part of the Webpack build.
+		new SWPrecacheWebpackPlugin({
+			// By default, a cache-busting query parameter is appended to requests
+			// used to populate the caches, to ensure the responses are fresh.
+			// If a URL is already hashed by Webpack, then there is no concern
+			// about it being stale, and the cache-busting can be skipped.
+			dontCacheBustUrlsMatching: /\.\w{8}\./,
+			filename: 'service-worker.js',
+			logger(message) {
+				if (message.indexOf('Total precache size is') === 0) {
+					// This message occurs for every build and is a bit too noisy.
+					return;
+				}
+				if (message.indexOf('Skipping static resource') === 0) {
+					// This message obscures real errors so we ignore it.
+					// https://github.com/facebookincubator/create-react-app/issues/2612
+					return;
+				}
+				// console.log(message);
+			},
+			minify: true,
+			// For unknown URLs, fallback to the index page
+			navigateFallback: publicUrl + '/index.html',
+			// Ignores URLs starting from /__ (useful for Firebase):
+			// https://github.com/facebookincubator/create-react-app/issues/2237#issuecomment-302693219
+			navigateFallbackWhitelist: [/^(?!\/__).*/],
+			// Don't precache sourcemaps (they're large) and build asset manifest:
+			staticFileGlobsIgnorePatterns: [/\.map$/, /asset-manifest\.json$/],
+		}),
+		// Moment.js is an extremely popular library that bundles large locale files
+		// by default due to how Webpack interprets its code. This is a practical
+		// solution that requires the user to opt into importing specific locales.
+		// https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
+		// You can remove this if you don't use Moment.js:
+		new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+	],
+	// Some libraries import Node modules but don't use them in the browser.
+	// Tell Webpack to provide empty mocks for them so importing them works.
+	node: {
+		dgram: 'empty',
+		fs: 'empty',
+		net: 'empty',
+		tls: 'empty',
+		child_process: 'empty',
+	},
 };
+
diff --git a/public/react/package.json b/public/react/package.json
index 6a0cf6d09..ac239dd0f 100644
--- a/public/react/package.json
+++ b/public/react/package.json
@@ -161,6 +161,7 @@
   "devDependencies": {
     "@babel/runtime": "7.0.0-beta.51",
     "babel-plugin-import": "^1.11.0",
+    "compression-webpack-plugin": "^1.1.12",
     "concat": "^1.0.3",
     "happypack": "^5.0.1",
     "node-sass": "^4.12.0",
diff --git a/public/react/src/App.js b/public/react/src/App.js
index b6c661597..9ec5a9634 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -76,10 +76,10 @@ const Otherloginstart=Loadable({
 	loading: Loading,
 })
 
-const TestIndex = Loadable({
-	loader: () => import('./modules/test'),
-	loading: Loading,
-})
+// const TestIndex = Loadable({
+// 	loader: () => import('./modules/test'),
+// 	loading: Loading,
+// })
 
 const IndexWrapperComponent = Loadable({
 	loader: () => import('./modules/page/IndexWrapper'),
@@ -91,23 +91,23 @@ const CommentComponent = Loadable({
 	loading: Loading,
 })
 
-const TestMaterialDesignComponent = Loadable({
-	loader: () => import('./modules/test/md/TestMaterialDesign'),
-	loading: Loading,
-})
-const TestCodeMirrorComponent = Loadable({
-	loader: () => import('./modules/test/codemirror/TestCodeMirror'),
-	loading: Loading,
-})
+// const TestMaterialDesignComponent = Loadable({
+// 	loader: () => import('./modules/test/md/TestMaterialDesign'),
+// 	loading: Loading,
+// })
+// const TestCodeMirrorComponent = Loadable({
+// 	loader: () => import('./modules/test/codemirror/TestCodeMirror'),
+// 	loading: Loading,
+// })
 
-const TestComponent = Loadable({
-	loader: () => import('./modules/test/TestRC'),
-	loading: Loading,
-})
-const TestUrlQueryComponent = Loadable({
-	loader: () => import('./modules/test/urlquery/TestUrlQuery'),
-	loading: Loading,
-})
+// const TestComponent = Loadable({
+// 	loader: () => import('./modules/test/TestRC'),
+// 	loading: Loading,
+// })
+// const TestUrlQueryComponent = Loadable({
+// 	loader: () => import('./modules/test/urlquery/TestUrlQuery'),
+// 	loading: Loading,
+// })
 
 const TPMIndexComponent = Loadable({
 	loader: () => import('./modules/tpm/TPMIndex'),
@@ -254,10 +254,10 @@ const Interestpage = Loadable({
 })
 
 //众包创新
-const ProjectPackages=Loadable({
-	loader: () => import('./modules/projectPackages/ProjectPackageIndex'),
-	loading: Loading,
-})
+// const ProjectPackages=Loadable({
+// 	loader: () => import('./modules/projectPackages/ProjectPackageIndex'),
+// 	loading: Loading,
+// })
 
 //竞赛
 const NewCompetitions=Loadable({
@@ -477,8 +477,8 @@ class App extends Component {
 												 return (<Topicbank {...this.props} {...props} {...this.state} />)
 											 }
 										 }></Route>
-							{/*众包创新*/}
-							<Route path={"/crowdsourcing"} component={ProjectPackages}/>
+							{/*/!*众包创新*!/*/}
+							{/*<Route path={"/crowdsourcing"} component={ProjectPackages}/>*/}
 							{/*竞赛*/}
 							<Route path={"/newcompetitions"} component={NewCompetitions}/>
 							{/*认证*/}
@@ -583,11 +583,11 @@ class App extends Component {
 							>
 							</Route>
 							<Route path="/comment" component={CommentComponent}/>
-							<Route path="/testMaterial" component={TestMaterialDesignComponent}/>
-							<Route path="/test" component={TestIndex}/>
-							<Route path="/testCodeMirror" component={TestCodeMirrorComponent}/>
-							<Route path="/testRCComponent" component={TestComponent}/>
-							<Route path="/testUrlQuery" component={TestUrlQueryComponent}/>
+							{/*<Route path="/testMaterial" component={TestMaterialDesignComponent}/>*/}
+							{/*<Route path="/test" component={TestIndex}/>*/}
+							{/*<Route path="/testCodeMirror" component={TestCodeMirrorComponent}/>*/}
+							{/*<Route path="/testRCComponent" component={TestComponent}/>*/}
+							{/*<Route path="/testUrlQuery" component={TestUrlQueryComponent}/>*/}
 							<Route path="/messages"
 										 render={
 											 (props)=>(<Messagerouting {...this.props} {...props} {...this.state}></Messagerouting>)
diff --git a/public/react/src/modules/competitions/competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/competitimain/CompetitionsIndex.js
index 3e0715736..1453ba9c9 100644
--- a/public/react/src/modules/competitions/competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/competitimain/CompetitionsIndex.js
@@ -4,6 +4,11 @@ import { Menu, Icon, List, Avatar,Row, Col,Tag,Pagination} from 'antd';
 import axios from 'axios';
 import './Competitionsindex.css';
 import NoneData from "../../courses/shixunHomework/shixunHomework";
+import groups1 from './groups1.png';
+import groups2 from './groups2.png';
+import groups3 from './groups3.png';
+
+
 
 const { SubMenu } = Menu;
 
@@ -105,55 +110,81 @@ class CompetitionsIndex extends Component{
 							</div>
 
 							<div className={"educontent clearfix mtf10 CompetitionsIndex "}>
+								<style>
+									{
+										`
+										.CompetitionsList{
+										     position: relative;
+										 }
+										`
+									}
+								</style>
 								<List
+									className={"CompetitionsList"}
 									itemLayout="vertical"
 									size="large"
 									dataSource={datas&&datas}
 									renderItem={(item,key) => (
-										<List.Item
-											key={key}
-											actions={[
-												<span>竞赛时间: 2019-08-07 24: 00～2019-09-10 24: 00</span>,
-												<span>报名截止时间：2019-08-07 08:10</span>,
-											]}
-											extra={
-												<div className={"pt50"} style={{"width":'305px'}}>
-													<Row gutter={16}>
-														<Col className="gutter-row" span={6}>
-															<div className="gutter-box CompetitionsIndexdadels">奖金</div>
-														</Col>
-														<Col className="gutter-row" span={6}>
-															<div className="gutter-box CompetitionsIndexdadels">浏览数</div>
-														</Col>
-														<Col className="gutter-row" span={6}>
-															<div className="gutter-box CompetitionsIndexdadels">报名数</div>
-														</Col>
-													</Row>
-
-													<Row gutter={16}>
-														<Col className="gutter-row" span={6}>
-															<div className="gutter-box CompetitionsIndexbottomvalue">¥4500</div>
-														</Col>
-														<Col className="gutter-row" span={6}>
-															<div className="gutter-box CompetitionsIndexbottomvalue">351</div>
-														</Col>
-														<Col className="gutter-row" span={6}>
-															<div className="gutter-box CompetitionsIndexbottomvalue">351</div>
-														</Col>
-													</Row>
-
-												</div>
-											}
-										>
-											<List.Item.Meta
-												title={<a><span className={"competitionstitles"}>{item.name}</span><span>{item.sub_title===null?"":<Tag className="competitionsrelative" color="#87d068">{
-													item.sub_title
-												}</Tag>}</span>
-												</a>}
-											/>
-											{item.description}
-										</List.Item>
-									)}
+										<div>
+
+											{item.description===null||item.description===undefined||item.description===""?<style>
+												{
+													`
+												 ..CompetitionsIndex .ant-list-vertical .ant-list-item-action{
+															margin-top:50px;
+												 }
+												`
+												}
+											</style>:""}
+											<img src={groups3} />
+											<List.Item
+												key={key}
+												actions={[
+													<span>竞赛时间: 2019-08-07 24: 00～2019-09-10 24: 00</span>,
+													<span>报名截止时间：2019-08-07 08:10</span>,
+												]}
+												extra={
+													<div className={"pt50"} style={{"width":'305px'}}>
+														<Row gutter={16}>
+															<Col className="gutter-row" span={6}>
+																<div className="gutter-box CompetitionsIndexdadels">奖金</div>
+															</Col>
+															<Col className="gutter-row" span={6}>
+																<div className="gutter-box CompetitionsIndexdadels">浏览数</div>
+															</Col>
+															<Col className="gutter-row" span={6}>
+																<div className="gutter-box CompetitionsIndexdadels">报名数</div>
+															</Col>
+														</Row>
+
+														<Row gutter={16}>
+															<Col className="gutter-row" span={6}>
+																<div className="gutter-box CompetitionsIndexbottomvalue">¥4500</div>
+															</Col>
+															<Col className="gutter-row" span={6}>
+																<div className="gutter-box CompetitionsIndexbottomvalue">351</div>
+															</Col>
+															<Col className="gutter-row" span={6}>
+																<div className="gutter-box CompetitionsIndexbottomvalue">351</div>
+															</Col>
+														</Row>
+
+													</div>
+												}
+											>
+												<List.Item.Meta
+													title={<a><span className={"competitionstitles"}>{item.name}</span><span>{item.sub_title===null?"":<Tag className="competitionsrelative" color="#87d068">{
+														item.sub_title
+													}</Tag>}</span>
+													</a>}
+												/>
+												{item.description}
+											</List.Item>
+										</div>
+
+									)
+
+									}
 								/>
 
 								<div className="mb40 edu-txt-center padding20-30"
diff --git a/public/react/src/modules/competitions/competitimain/groups1.png b/public/react/src/modules/competitions/competitimain/groups1.png
new file mode 100644
index 0000000000000000000000000000000000000000..eee9489f4e15007de07c6c952cf5da287b15dfe8
GIT binary patch
literal 3275
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
JPDHLkV1ftBEs_8L

literal 0
HcmV?d00001

diff --git a/public/react/src/modules/competitions/competitimain/groups2.png b/public/react/src/modules/competitions/competitimain/groups2.png
new file mode 100644
index 0000000000000000000000000000000000000000..a75cecc30ce0d8fb18277b893265a85e2a819035
GIT binary patch
literal 4820
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

literal 0
HcmV?d00001

diff --git a/public/react/src/modules/competitions/competitimain/groups3.png b/public/react/src/modules/competitions/competitimain/groups3.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0caeebd38f6c6249e59155f748f175bd1699ecb
GIT binary patch
literal 3671
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

literal 0
HcmV?d00001